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.368 by root, Mon Jun 25 05:43:37 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->hide
326 : $self->show;
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
728our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
950
951sub new {
952 my $class = shift;
953
954 $class->SUPER::new (
955 scroll_x => 0,
956 scroll_y => 1,
957 @_,
958 )
959}
729 960
730sub size_request { 961sub size_request {
731 my ($self) = @_; 962 my ($self) = @_;
732 963
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 965
736 @$self{qw(child_w child_h)} 966 $w = 10 if $self->{scroll_x};
737} 967 $h = 10 if $self->{scroll_y};
738 968
969 ($w, $h)
970}
971
739sub size_allocate { 972sub invoke_size_allocate {
740 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
741 974
975 my $child = $self->child;
976
977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
979
980 $self->child->configure (0, 0, $w, $h);
742 $self->update; 981 $self->update;
982
983 1
743} 984}
744 985
745sub set_offset { 986sub set_offset {
746 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
747 988
… …
773 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
774 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
775 ) { 1016 ) {
776 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
777 } else { 1018 } else {
778 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
779 } 1020 }
780} 1021}
781 1022
782sub _render { 1023sub _render {
783 my ($self) = @_; 1024 my ($self) = @_;
784 1025
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1028
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 1030
787 $self->SUPER::_render; 1031 $self->SUPER::_render;
788} 1032}
789 1033
790############################################################################# 1034#############################################################################
791 1035
792package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
793 1037
794our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
795 1039
796sub new { 1040sub new {
797 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
798 1044
799 my $self; 1045 my $self;
800 1046
801 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
802 vertical => 1, 1048 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 1050 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1051 $self->{vp}->set_offset (0, $_[1]);
806 }, 1052 },
807 ; 1053 ;
808 1054
809 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
811 slider => $slider, 1058 slider => $slider,
812 @_, 1059 %arg,
813 ); 1060 );
814 1061
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
1063 $self->add ($child) if $child;
818 1064
819 $self 1065 $self
820} 1066}
821 1067
822#TODO# update range on size_allocate depending on child 1068#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1069
1070sub add {
1071 my ($self, $widget) = @_;
1072
1073 $self->{vp}->add ($self->{child} = $widget);
1074}
1075
1076sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_;
1078
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev);
1082
1083 1
1084}
1085
1086sub update_slider {
1087 my ($self) = @_;
1088
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1090}
1091
1092sub update {
1093 my ($self) = @_;
1094
1095 $self->SUPER::update;
1096
1097 $self->update_slider;
1098}
1099
1100sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_;
1102
1103 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h)
1106}
824 1107
825############################################################################# 1108#############################################################################
826 1109
827package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
828 1111
829our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
830 1113
831use CFClient::OpenGL; 1114use CFPlus::OpenGL;
832 1115
833sub new { 1116sub new {
834 my $class = shift; 1117 my $class = shift;
835 1118
836 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
844 1127
845 if ($self->{bg}) { 1128 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1129 my ($w, $h) = @$self{qw(w h)};
847 1130
848 glEnable GL_BLEND; 1131 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1132 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1133 glColor_premultiply @{ $self->{bg} };
851 1134
852 glBegin GL_QUADS; 1135 glBegin GL_QUADS;
853 glVertex 0 , 0; 1136 glVertex 0 , 0;
854 glVertex 0 , $h; 1137 glVertex 0 , $h;
855 glVertex $w, $h; 1138 glVertex $w, $h;
… …
862 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
863} 1146}
864 1147
865############################################################################# 1148#############################################################################
866 1149
867package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
868 1151
869our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
870 1153
871use CFClient::OpenGL; 1154use 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 1155
877sub new { 1156sub new {
878 my $class = shift; 1157 my ($class, %arg) = @_;
879 1158
880 # TODO: user_x, user_y, overwrite moveto? 1159 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label
1161 align => 1,
1162 valign => 0,
1163 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75;
1165 }
881 1166
882 my $self = $class->SUPER::new ( 1167 my $self = $class->SUPER::new (
1168 # label => "",
883 bg => [1, 1, 1, 1], 1169 fg => [0.6, 0.3, 0.1],
884 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1170 border => 0.8,
886 toplevel => 1, 1171 style => 'single',
887 can_events => 1, 1172 %arg,
888 @_
889 ); 1173 );
890 1174
891 $self->{title} &&= new CFClient::UI::Label
892 align => 0,
893 valign => 1,
894 text => $self->{title},
895 fontsize => $self->{border};
896
897 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
898} 1183}
899 1184
900sub border { 1185sub border {
901 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
902} 1187}
903 1188
904sub size_request { 1189sub size_request {
905 my ($self) = @_; 1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
906 1194
907 my ($w, $h) = $self->SUPER::size_request; 1195 my ($w, $h) = $self->SUPER::size_request;
908 1196
909 ( 1197 (
910 $w + $self->border * 2, 1198 $w + $self->border * 2,
911 $h + $self->border * 2, 1199 $h + $self->border * 2,
912 ) 1200 )
913} 1201}
914 1202
915sub size_allocate { 1203sub invoke_size_allocate {
916 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
917 1205
918 $h -= List::Util::max 0, $self->border * 2; 1206 my $border = $self->border;
1207
919 $w -= List::Util::max 0, $self->border * 2; 1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
920 1210
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1211 if (my $label = $self->{label}) {
922 if $self->{title}; 1212 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1213 $label->{h} = List::Util::min $h, $border;
1214 $label->invoke_size_allocate ($label->{w}, $label->{h});
1215 }
923 1216
924 $self->child->configure ($self->border, $self->border, $w, $h); 1217 $self->child->configure ($border, $border, $w, $h);
925}
926 1218
1219 1
1220}
1221
1222sub _draw {
1223 my ($self) = @_;
1224
1225 my $child = $self->{children}[0];
1226
1227 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h});
1229
1230 $child->draw;
1231
1232 glColor @{$self->{fg}};
1233 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1238 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1239 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1240 glEnd;
1241
1242 if ($self->{label}) {
1243 glTranslate $border * 2, 0;
1244 $self->{label}->_draw;
1245 }
1246}
1247
1248#############################################################################
1249
1250package CFPlus::UI::Toplevel;
1251
1252our @ISA = CFPlus::UI::Bin::;
1253
1254use CFPlus::OpenGL;
1255
1256my $bg =
1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1258 mipmap => 1, wrap => 1;
1259
1260my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263
1264sub new {
1265 my ($class, %arg) = @_;
1266
1267 my $self = $class->SUPER::new (
1268 bg => [1, 1, 1, 1],
1269 border_bg => [1, 1, 1, 1],
1270 border => 0.6,
1271 can_events => 1,
1272 min_w => 64,
1273 min_h => 32,
1274 %arg,
1275 );
1276
1277 $self->{title_widget} = new CFPlus::UI::Label
1278 align => 0,
1279 valign => 1,
1280 text => $self->{title},
1281 fontsize => $self->{border},
1282 if exists $self->{title};
1283
1284 if ($self->{has_close_button}) {
1285 $self->{close_button} =
1286 new CFPlus::UI::ImageButton
1287 path => 'x1_close.png',
1288 on_activate => sub { $self->emit ("delete") };
1289
1290 $self->CFPlus::UI::Container::add ($self->{close_button});
1291 }
1292
1293 $self
1294}
1295
1296sub add {
1297 my ($self, @widgets) = @_;
1298
1299 $self->SUPER::add (@widgets);
1300 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1301 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1302}
1303
1304sub border {
1305 int $_[0]{border} * $::FONTSIZE
1306}
1307
1308sub size_request {
1309 my ($self) = @_;
1310
1311 $self->{title_widget}->size_request
1312 if $self->{title_widget};
1313
1314 $self->{close_button}->size_request
1315 if $self->{close_button};
1316
1317 my ($w, $h) = $self->SUPER::size_request;
1318
1319 (
1320 $w + $self->border * 2,
1321 $h + $self->border * 2,
1322 )
1323}
1324
1325sub invoke_size_allocate {
1326 my ($self, $w, $h) = @_;
1327
1328 if ($self->{title_widget}) {
1329 $self->{title_widget}{w} = $w;
1330 $self->{title_widget}{h} = $h;
1331 $self->{title_widget}->invoke_size_allocate ($w, $h);
1332 }
1333
1334 my $border = $self->border;
1335
1336 $h -= List::Util::max 0, $border * 2;
1337 $w -= List::Util::max 0, $border * 2;
1338
1339 $self->child->configure ($border, $border, $w, $h);
1340
1341 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1342 if $self->{close_button};
1343
1344 1
1345}
1346
1347sub invoke_delete {
1348 my ($self) = @_;
1349
1350 $self->hide;
1351
1352 1
1353}
1354
927sub button_down { 1355sub invoke_button_down {
928 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
929 1357
930 my ($w, $h) = @$self{qw(w h)}; 1358 my ($w, $h) = @$self{qw(w h)};
931 my $border = $self->border; 1359 my $border = $self->border;
932 1360
… …
945 my ($ev, $x, $y) = @_; 1373 my ($ev, $x, $y) = @_;
946 1374
947 my $dx = $ev->{x} - $ox; 1375 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1376 my $dy = $ev->{y} - $oy;
949 1377
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1378 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1379 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1380
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1381 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1382 $self->realloc;
954 }; 1383 };
955 1384
956 } elsif ($lr ^ $td) { 1385 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1386 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1387 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1389 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1390 my ($ev, $x, $y) = @_;
962 1391
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1392 ($x, $y) = ($ev->{x}, $ev->{y});
964 1393
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1394 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1395 # HACK: the next line is required to enforce placement
1396 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1397 };
1398 } else {
1399 return 0;
1400 }
1401
968 } 1402 1
969} 1403}
970 1404
971sub button_up { 1405sub invoke_button_up {
972 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
973 1407
974 delete $self->{motion}; 1408 ! ! delete $self->{motion}
975} 1409}
976 1410
977sub mouse_motion { 1411sub invoke_mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1412 my ($self, $ev, $x, $y) = @_;
979 1413
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1414 $self->{motion}->($ev, $x, $y) if $self->{motion};
1415
1416 ! ! $self->{motion}
1417}
1418
1419sub invoke_visibility_change {
1420 my ($self, $visible) = @_;
1421
1422 delete $self->{motion} unless $visible;
1423
1424 0
981} 1425}
982 1426
983sub _draw { 1427sub _draw {
984 my ($self) = @_; 1428 my ($self) = @_;
985 1429
1430 my $child = $self->{children}[0];
1431
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1432 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1433 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1434
989 glEnable GL_TEXTURE_2D; 1435 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1437
992 my $border = $self->border; 1438 my $border = $self->border;
993 1439
994 glColor @{ $self->{border_bg} }; 1440 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1441 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1445
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1447 glColor @{ $self->{bg} };
1002 1448
1003 # TODO: repeat texture not scale 1449 # TODO: repeat texture not scale
1450 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1451 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1452 $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); 1453 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1454 }
1014 1455
1015 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1016 1457
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1458 $child->draw;
1459
1460 if ($self->{title_widget}) {
1461 glTranslate 0, $border - $self->{h};
1462 $self->{title_widget}->_draw;
1463
1464 glTranslate 0, - ($border - $self->{h});
1465 }
1466
1467 $self->{close_button}->draw
1468 if $self->{close_button};
1020} 1469}
1021 1470
1022############################################################################# 1471#############################################################################
1023 1472
1024package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1025 1474
1026our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1027 1476
1028use List::Util qw(max sum); 1477use List::Util qw(max sum);
1029 1478
1030use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1031 1480
1032sub new { 1481sub new {
1033 my $class = shift; 1482 my $class = shift;
1034 1483
1035 $class->SUPER::new ( 1484 $class->SUPER::new (
1036 col_expand => [], 1485 col_expand => [],
1037 @_ 1486 @_,
1038 ) 1487 )
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} 1488}
1049 1489
1050sub children { 1490sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052} 1492}
1053 1493
1494sub add {
1495 my ($self) = shift;
1496
1497 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, ();
1499 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child;
1501 }
1502
1503 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1;
1505 $self->realloc;
1506}
1507
1508sub remove {
1509 my ($self, $child) = @_;
1510
1511 # TODO: not yet implemented
1512}
1513
1054# TODO: move to container class maybe? send childs a signal on removal? 1514# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1515sub clear {
1056 my ($self) = @_; 1516 my ($self) = @_;
1057 1517
1058 my @children = $self->children; 1518 my @children = $self->children;
1059 delete $self->{children}; 1519 delete $self->{children};
… …
1061 for (@children) { 1521 for (@children) {
1062 delete $_->{parent}; 1522 delete $_->{parent};
1063 $_->hide; 1523 $_->hide;
1064 } 1524 }
1065 1525
1066 $self->update; 1526 $self->realloc;
1067} 1527}
1068 1528
1069sub get_wh { 1529sub get_wh {
1070 my ($self) = @_; 1530 my ($self) = @_;
1071 1531
… …
1097 (sum @$ws), 1557 (sum @$ws),
1098 (sum @$hs), 1558 (sum @$hs),
1099 ) 1559 )
1100} 1560}
1101 1561
1102sub size_allocate { 1562sub invoke_size_allocate {
1103 my ($self, $w, $h) = @_; 1563 my ($self, $w, $h) = @_;
1104 1564
1105 my ($ws, $hs) = $self->get_wh; 1565 my ($ws, $hs) = $self->get_wh;
1106 1566
1107 my $req_w = sum @$ws; 1567 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1568 my $req_h = (sum @$hs) || 1;
1109 1569
1110 # TODO: nicer code && do row_expand 1570 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1571 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1572 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1573 my $col_expand = (sum @col_expand) || 1;
1114 1574
1115 # linearly scale sizes 1575 # linearly scale sizes
1116 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1117 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1118 1578
1119 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1120 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1121 1581
1122 my $y; 1582 my $y;
1123 1583
1124 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1125 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1139 } 1599 }
1140 1600
1141 $y += $row_h; 1601 $y += $row_h;
1142 } 1602 }
1143 1603
1604 1
1144} 1605}
1145 1606
1146sub find_widget { 1607sub find_widget {
1147 my ($self, $x, $y) = @_; 1608 my ($self, $x, $y) = @_;
1148 1609
… …
1167 } 1628 }
1168} 1629}
1169 1630
1170############################################################################# 1631#############################################################################
1171 1632
1172package CFClient::UI::HBox; 1633package CFPlus::UI::Box;
1173 1634
1174# TODO: wrap into common Box base class
1175
1176our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1177 1636
1178sub size_request { 1637sub size_request {
1179 my ($self) = @_; 1638 my ($self) = @_;
1180 1639
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1640 $self->{vertical}
1641 ? (
1642 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1643 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1644 )
1645 : (
1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1647 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1648 )
1649}
1182 1650
1651sub invoke_size_allocate {
1652 my ($self, $w, $h) = @_;
1653
1654 my $space = $self->{vertical} ? $h : $w;
1655 my @children = $self->visible_children;
1656
1657 my @req;
1658
1659 if ($self->{homogeneous}) {
1660 @req = ($space / (@children || 1)) x @children;
1661 } else {
1662 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1663 my $req = List::Util::sum @req;
1664
1665 if ($req > $space) {
1666 # ah well, not enough space
1667 $_ *= $space / $req for @req;
1668 } else {
1669 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1670
1671 $space = ($space - $req) / $expand; # remaining space to give away
1672
1673 $req[$_] += $space * $children[$_]{expand}
1674 for 0 .. $#children;
1675 }
1183 ( 1676 }
1184 (List::Util::sum map $_->[0], @alloc), 1677
1185 (List::Util::max map $_->[1], @alloc), 1678 CFPlus::UI::harmonize \@req;
1679
1680 my $pos = 0;
1681 for (0 .. $#children) {
1682 my $alloc = $req[$_];
1683 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1684
1685 $pos += $alloc;
1686 }
1687
1688 1
1689}
1690
1691#############################################################################
1692
1693package CFPlus::UI::HBox;
1694
1695our @ISA = CFPlus::UI::Box::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 $class->SUPER::new (
1701 vertical => 0,
1702 @_,
1186 ) 1703 )
1187} 1704}
1188 1705
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############################################################################# 1706#############################################################################
1231 1707
1232package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1233 1709
1234# TODO: wrap into common Box base class 1710our @ISA = CFPlus::UI::Box::;
1235 1711
1236our @ISA = CFClient::UI::Container::; 1712sub new {
1713 my $class = shift;
1237 1714
1238sub size_request { 1715 $class->SUPER::new (
1239 my ($self) = @_; 1716 vertical => 1,
1240 1717 @_,
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 ) 1718 )
1247} 1719}
1248 1720
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############################################################################# 1721#############################################################################
1289 1722
1290package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1291 1724
1292our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1293 1726
1294use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1295 1728
1296sub new { 1729sub new {
1297 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1298 1731
1299 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1302 #active_bg => none 1735 #active_bg => none
1303 #font => default_font 1736 #font => default_font
1304 #text => initial text 1737 #text => initial text
1305 #markup => initial narkup 1738 #markup => initial narkup
1306 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1307 ellipsise => 3, # end 1741 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1309 fontsize => 1, 1743 fontsize => 1,
1310 align => -1, 1744 align => -1,
1311 valign => -1, 1745 valign => -1,
1312 padding => 2, 1746 padding_x => 2,
1747 padding_y => 2,
1313 can_events => 0, 1748 can_events => 0,
1314 %arg 1749 %arg
1315 ); 1750 );
1316 1751
1317 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1318 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1319 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1320 $self->{template} = $layout; 1755 $self->{template} = $layout;
1321 } 1756 }
1322 1757
1323 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1327 } 1762 }
1328 1763
1329 $self 1764 $self
1330} 1765}
1331 1766
1332sub escape($) {
1333 local $_ = $_[0];
1334
1335 s/&/&amp;/g;
1336 s/>/&gt;/g;
1337 s/</&lt;/g;
1338
1339 $_
1340}
1341
1342sub update { 1767sub update {
1343 my ($self) = @_; 1768 my ($self) = @_;
1344 1769
1345 delete $self->{texture}; 1770 delete $self->{texture};
1346 $self->SUPER::update; 1771 $self->SUPER::update;
1347} 1772}
1348 1773
1774sub realloc {
1775 my ($self) = @_;
1776
1777 delete $self->{ox};
1778 $self->SUPER::realloc;
1779}
1780
1349sub set_text { 1781sub set_text {
1350 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1351 1783
1352 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1354 1786
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1357 1788
1789 delete $self->{size_req};
1790 $self->realloc;
1358 $self->update; 1791 $self->update;
1359 $self->check_size;
1360} 1792}
1361 1793
1362sub set_markup { 1794sub set_markup {
1363 my ($self, $markup) = @_; 1795 my ($self, $markup) = @_;
1364 1796
1365 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1366 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1367 1799
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1801
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1372 1803
1804 delete $self->{size_req};
1805 $self->realloc;
1373 $self->update; 1806 $self->update;
1374 $self->check_size;
1375} 1807}
1376 1808
1377sub size_request { 1809sub size_request {
1378 my ($self) = @_; 1810 my ($self) = @_;
1379 1811
1812 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1814 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1815 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1818
1386 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1387 1820
1388 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1822 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1);
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1825
1392 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1393 1827
1394 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1830 }
1831
1832 [$w, $h]
1396 } 1833 };
1397 1834
1398 ( 1835 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1836}
1403 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1404sub size_allocate { 1842sub invoke_size_allocate {
1405 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1406 1844
1845 delete $self->{ox};
1846
1407 delete $self->{texture}; 1847 delete $self->{texture}
1848 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1849
1850 1
1408} 1851}
1409 1852
1410sub set_fontsize { 1853sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1412 1855
1413 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1414 delete $self->{texture}; 1858 delete $self->{texture};
1415 1859
1416 $self->update; 1860 $self->realloc;
1417 $self->check_size; 1861}
1862
1863sub reconfigure {
1864 my ($self) = @_;
1865
1866 delete $self->{size_req};
1867 delete $self->{texture};
1868
1869 $self->SUPER::reconfigure;
1418} 1870}
1419 1871
1420sub _draw { 1872sub _draw {
1421 my ($self) = @_; 1873 my ($self) = @_;
1422 1874
1423 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1424 1876
1425 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1426 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1427 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1428 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1884
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1885 [$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 }; 1886 };
1445 1887
1446 glEnable GL_TEXTURE_2D; 1888 unless (exists $self->{ox}) {
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1891 : ($self->{w} - $size->[0]) * 0.5);
1448 1892
1449 if ($tex->{format} == GL_ALPHA) { 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1450 glColor @{$self->{fg}}; 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1895 : ($self->{h} - $size->[1]) * 0.5);
1452 } else {
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 } 1896 };
1455 1897
1456 glDisable GL_TEXTURE_2D; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1900
1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1457} 1902}
1458 1903
1459############################################################################# 1904#############################################################################
1460 1905
1461package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1462 1907
1463our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1464 1909
1465use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1466 1911
1467sub new { 1912sub new {
1468 my $class = shift; 1913 my $class = shift;
1469 1914
1470 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1474 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1475 can_hover => 1, 1920 can_hover => 1,
1476 can_focus => 1, 1921 can_focus => 1,
1477 valign => 0, 1922 valign => 0,
1478 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1925 #text => ...
1926 #hidden => "*",
1479 @_ 1927 @_
1480 ) 1928 )
1481} 1929}
1482 1930
1483sub _set_text { 1931sub _set_text {
… …
1485 1933
1486 delete $self->{cur_h}; 1934 delete $self->{cur_h};
1487 1935
1488 return if $self->{text} eq $text; 1936 return if $self->{text} eq $text;
1489 1937
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1939 $self->{text} = $text;
1494 1940
1495 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1943 delete $self->{size_req};
1497 1944
1498 $self->emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1946
1947 $self->realloc;
1948 $self->update;
1499} 1949}
1500 1950
1501sub set_text { 1951sub set_text {
1502 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1503 1953
1504 $self->{cursor} = length $text; 1954 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1955 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1956}
1509 1957
1510sub get_text { 1958sub get_text {
1511 $_[0]{text} 1959 $_[0]{text}
1512} 1960}
… …
1517 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1518 1966
1519 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1520} 1968}
1521 1969
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 { 1970sub invoke_key_down {
1529 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1530 1972
1531 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1532 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1533 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1534 1976
1535 my $text = $self->get_text; 1977 my $text = $self->get_text;
1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1536 1980
1537 if ($uni == 8) { 1981 if ($uni == 8) {
1538 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1539 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1540 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1541 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1542 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1543 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1544 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1989 } elsif ($sym == CFPlus::SDLK_HOME) {
1990 # what a hack
1991 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1
1994 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) {
1996 # uh, again
1997 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1
2000 : length $self->{text};
2001 } elsif ($uni == 21) { # ctrl-u
2002 $text = "";
1546 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 2005 $self->emit ('escape');
1551 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
2010 } else {
2011 return 0;
1553 } 2012 }
1554 2013
1555 $self->_set_text ($text); 2014 $self->_set_text ($text);
2015
2016 $self->realloc;
1556 $self->update; 2017 $self->update;
1557 $self->check_size;
1558}
1559 2018
2019 1
2020}
2021
1560sub focus_in { 2022sub invoke_focus_in {
1561 my ($self) = @_; 2023 my ($self) = @_;
1562 2024
1563 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1564 2026
1565 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1566} 2028}
1567 2029
1568sub button_down { 2030sub invoke_button_down {
1569 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1570 2032
1571 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1572 2034
1573 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1574 2036
1575 # byte-index to char-index 2037 # byte-index to char-index
1576 my $text = $self->{text}; 2038 my $text = $self->{text};
1577 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1579 2041
1580 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1581 $self->update; 2043 $self->update;
2044
2045 1
1582} 2046}
1583 2047
1584sub mouse_motion { 2048sub invoke_mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2050# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2051
2052 1
1587} 2053}
1588 2054
1589sub _draw { 2055sub _draw {
1590 my ($self) = @_; 2056 my ($self) = @_;
1591 2057
1592 local $self->{fg} = $self->{fg}; 2058 local $self->{fg} = $self->{fg};
1593 2059
1594 if ($FOCUS == $self) { 2060 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 2061 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 2062 $self->{fg} = $self->{active_fg};
1597 } else { 2063 } else {
1598 glColor @{$self->{bg}}; 2064 glColor_premultiply @{$self->{bg}};
1599 } 2065 }
1600 2066
1601 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 2069 glBegin GL_QUADS;
1604 glVertex 0 , 0; 2070 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 2071 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 2072 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 2073 glVertex $self->{w}, 0;
… …
1618 utf8::encode $text; 2084 utf8::encode $text;
1619 2085
1620 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1621 } 2087 }
1622 2088
1623 glColor @{$self->{fg}};
1624 glBegin GL_LINES; 2089 glBegin GL_LINES;
1625 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2090 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}; 2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1627 glEnd; 2092 glEnd;
1628 } 2093 }
1629} 2094}
1630 2095
2096#############################################################################
2097
1631package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1632 2099
1633our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1634 2101
1635use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1636 2103
1637sub key_down { 2104sub invoke_key_down {
1638 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1639 2106
1640 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1641 2108
1642 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1643 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1645 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 2115 $self->emit (activate => $txt);
1648 $self->update; 2116 $self->update;
1649 2117
1650 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1653 } 2121 }
1654 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1655 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1657 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1658 } 2126 }
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } 2128 }
1661 2129
1662 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1663 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1664 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1665 2133
1666 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1667 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1668 } else { 2136 } else {
1669 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1670 } 2138 }
1671 2139
1672 } else { 2140 } else {
1673 $self->SUPER::key_down ($ev); 2141 return $self->SUPER::invoke_key_down ($ev)
2142 }
2143
1674 } 2144 1
1675
1676} 2145}
1677 2146
1678############################################################################# 2147#############################################################################
1679 2148
2149package CFPlus::UI::TextEdit;
2150
2151our @ISA = CFPlus::UI::EntryBase::;
2152
2153use CFPlus::OpenGL;
2154
2155sub move_cursor_ver {
2156 my ($self, $dy) = @_;
2157
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159
2160 $y += $dy;
2161
2162 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2163 $self->{cursor} = $index;
2164 delete $self->{cur_h};
2165 $self->update;
2166 return;
2167 }
2168}
2169
2170sub invoke_key_down {
2171 my ($self, $ev) = @_;
2172
2173 my $sym = $ev->{sym};
2174
2175 if ($sym == CFPlus::SDLK_UP) {
2176 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1);
2179 } else {
2180 return $self->SUPER::invoke_key_down ($ev)
2181 }
2182
2183 1
2184}
2185
2186#############################################################################
2187
1680package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1681 2189
1682our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1683 2191
1684use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1685 2193
1686my @tex = 2194my @tex =
1687 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1688 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1689 2197
1690sub new { 2198sub new {
1691 my $class = shift; 2199 my $class = shift;
1692 2200
1693 $class->SUPER::new ( 2201 $class->SUPER::new (
1694 padding => 4, 2202 padding_x => 4,
2203 padding_y => 4,
1695 fg => [1, 1, 1], 2204 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 2205 active_fg => [0, 0, 1],
1697 can_hover => 1, 2206 can_hover => 1,
1698 align => 0, 2207 align => 0,
1699 valign => 0, 2208 valign => 0,
1700 can_events => 1, 2209 can_events => 1,
1701 @_ 2210 @_
1702 ) 2211 )
1703} 2212}
1704 2213
1705sub button_up { 2214sub invoke_button_up {
1706 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1707 2216
2217 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 2219 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 2220
1711 } 2221 1
1712} 2222}
1713 2223
1714sub _draw { 2224sub _draw {
1715 my ($self) = @_; 2225 my ($self) = @_;
1716 2226
1717 local $self->{fg} = $self->{fg}; 2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 2228
1723 glEnable GL_TEXTURE_2D; 2229 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 2231 glColor 0, 0, 0, 1;
1726 2232
… …
1731 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1732} 2238}
1733 2239
1734############################################################################# 2240#############################################################################
1735 2241
1736package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1737 2243
1738our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1739 2245
1740my @tex = 2246my @tex =
1741 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1742 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1743 2249
1744use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1745 2251
1746sub new { 2252sub new {
1747 my $class = shift; 2253 my $class = shift;
1748 2254
1749 $class->SUPER::new ( 2255 $class->SUPER::new (
1750 padding => 2, 2256 padding_x => 2,
2257 padding_y => 2,
1751 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2259 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2260 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2261 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2262 state => 0,
… …
1759} 2266}
1760 2267
1761sub size_request { 2268sub size_request {
1762 my ($self) = @_; 2269 my ($self) = @_;
1763 2270
1764 ($self->{padding} * 2 + 6) x 2 2271 (6) x 2
1765} 2272}
1766 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1767sub button_down { 2282sub invoke_button_down {
1768 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1769 2284
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2287 $self->toggle;
1773 $self->emit (changed => $self->{state}); 2288 } else {
2289 return 0
2290 }
2291
1774 } 2292 1
1775} 2293}
1776 2294
1777sub _draw { 2295sub _draw {
1778 my ($self) = @_; 2296 my ($self) = @_;
1779 2297
1780 $self->SUPER::_draw; 2298 $self->SUPER::_draw;
1781 2299
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2301
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2302 my ($w, $h) = @$self{qw(w h)};
2303
2304 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2305
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2306 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2307
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2308 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2309
… …
1792 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
1793} 2313}
1794 2314
1795############################################################################# 2315#############################################################################
1796 2316
1797package CFClient::UI::Image; 2317package CFPlus::UI::Image;
1798 2318
1799our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
1800 2320
1801use CFClient::OpenGL; 2321use CFPlus::OpenGL;
1802use Carp qw/confess/;
1803 2322
1804our %loaded_images; 2323our %texture_cache;
1805 2324
1806sub new { 2325sub new {
1807 my $class = shift; 2326 my $class = shift;
1808 2327
1809 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
1810 2332
1811 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2333 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required";
1812 2335
1813 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1814 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1815 2338
1816 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
1817 2340
1818 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1819
1820 $self->{aspect} = $tex->{w} / $tex->{h};
1821 2342
1822 $self 2343 $self
1823} 2344}
1824 2345
2346sub STORABLE_freeze {
2347 my ($self, $cloning) = @_;
2348
2349 $self->{path}
2350 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2351
2352 $self->{path}
2353}
2354
2355sub STORABLE_attach {
2356 my ($self, $cloning, $path) = @_;
2357
2358 $self->new (path => $path)
2359}
2360
1825sub size_request { 2361sub size_request {
1826 my ($self) = @_; 2362 my ($self) = @_;
1827 2363
1828 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
1829} 2365}
1830 2366
1831sub _draw { 2367sub _draw {
1832 my ($self) = @_; 2368 my ($self) = @_;
1833 2369
… …
1843 } 2379 }
1844 2380
1845 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
1846 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1847 2383
1848 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
1849 2385
1850 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
1851} 2387}
1852 2388
1853############################################################################# 2389#############################################################################
1854 2390
2391package CFPlus::UI::ImageButton;
2392
2393our @ISA = CFPlus::UI::Image::;
2394
2395use CFPlus::OpenGL;
2396
2397my %textures;
2398
2399sub new {
2400 my $class = shift;
2401
2402 my $self = $class->SUPER::new (
2403 padding_x => 4,
2404 padding_y => 4,
2405 fg => [1, 1, 1],
2406 active_fg => [0, 0, 1],
2407 can_hover => 1,
2408 align => 0,
2409 valign => 0,
2410 can_events => 1,
2411 @_
2412 );
2413}
2414
2415sub invoke_button_up {
2416 my ($self, $ev, $x, $y) = @_;
2417
2418 $self->emit ("activate")
2419 if $x >= 0 && $x < $self->{w}
2420 && $y >= 0 && $y < $self->{h};
2421
2422 1
2423}
2424
2425#############################################################################
2426
1855package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
1856 2428
1857our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
1858 2430
1859use List::Util qw(min max); 2431use List::Util qw(min max);
1860 2432
1861use CFClient::OpenGL; 2433use CFPlus::OpenGL;
1862 2434
1863my %tex = ( 2435my %tex = (
1864 food => [ 2436 food => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1867 ], 2439 ],
1868 grace => [ 2440 grace => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 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/ 2442 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1871 ], 2443 ],
1872 hp => [ 2444 hp => [
1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1874 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1875 ], 2447 ],
1876 mana => [ 2448 mana => [
1877 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 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/ 2450 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1879 ], 2451 ],
1880); 2452);
1881 2453
1882# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1942 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
1943 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
1944 2516
1945 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2518 my $h2 = $self->{h} * (1 - $ycut2);
2519 my $h3 = $self->{h};
2520
2521 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1947 2522
1948 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2528
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2529 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2530 glBegin GL_QUADS;
… …
1969 2545
1970 if ($t3) { 2546 if ($t3) {
1971 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
1972 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
1973 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1974 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1975 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1976 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1977 glEnd; 2553 glEnd;
1978 } 2554 }
1979 2555
1980 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
1981 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
1982} 2558}
1983 2559
1984############################################################################# 2560#############################################################################
1985 2561
1986package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
1987 2563
1988our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
1989 2565
1990sub new { 2566sub new {
1991 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
1992 2568
1993 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
1995 can_hover => 1, 2571 can_hover => 1,
1996 can_events => 1, 2572 can_events => 1,
1997 %arg, 2573 %arg,
1998 ); 2574 );
1999 2575
2000 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2576 $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); 2577 $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"); 2578 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2003 2579
2004 $self 2580 $self
2005} 2581}
2006 2582
2007sub set_fontsize { 2583sub set_fontsize {
… …
2028 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2029} 2605}
2030 2606
2031############################################################################# 2607#############################################################################
2032 2608
2033package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2034 2610
2035use strict; 2611use strict;
2036 2612
2037use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2038 2614
2039our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2040 2616
2041my @tex = 2617my @tex =
2042 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2043 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2044 2620
2045sub new { 2621sub new {
2046 my $class = shift; 2622 my $class = shift;
2047 2623
… …
2053 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2630 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2631 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2632 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2633 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2634 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2635 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2636 min_h => $::WIDTH / 80,
2061 vertical => 0, 2637 vertical => 0,
2062 can_hover => 1, 2638 can_hover => 1,
2063 inner_pad => 0.02, 2639 inner_pad => 0.02,
2064 @_ 2640 @_
2065 ); 2641 );
… …
2068 $self->update; 2644 $self->update;
2069 2645
2070 $self 2646 $self
2071} 2647}
2072 2648
2649sub set_range {
2650 my ($self, $range) = @_;
2651
2652 ($range, $self->{range}) = ($self->{range}, $range);
2653
2654 if ("@$range" ne "@{$self->{range}}") {
2655 $self->update;
2656 $self->set_value ($self->{range}[0]);
2657 }
2658}
2659
2073sub set_value { 2660sub set_value {
2074 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2075 2662
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2663 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2664
2078 $hi = $lo + 1 if $hi <= $lo; 2665 $hi = $lo + 1 if $hi <= $lo;
2079 2666
2667 $page = $hi - $lo if $page > $hi - $lo;
2668
2080 $value = $lo if $value < $lo; 2669 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2670 $value = $hi - $page if $value > $hi - $page;
2082 2671
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2672 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2673 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2674
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2676
2090 if ($value != $old_value) { 2677 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2678 $self->emit (changed => $value);
… …
2094} 2681}
2095 2682
2096sub size_request { 2683sub size_request {
2097 my ($self) = @_; 2684 my ($self) = @_;
2098 2685
2099 my $w = $self->{req_w}; 2686 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2687}
2104 2688
2105sub button_down { 2689sub invoke_button_down {
2106 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2107 2691
2108 $self->SUPER::button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2693
2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695
2109 $self->mouse_motion ($ev, $x, $y); 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2110} 2697}
2111 2698
2112sub mouse_motion { 2699sub invoke_mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2114 2701
2115 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2704
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2705 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2706
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2707 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2708
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2709 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2710 } else {
2711 return 0;
2712 }
2713
2123 } 2714 1
2715}
2716
2717sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_;
2719
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725
2726 ! ! $delta
2124} 2727}
2125 2728
2126sub update { 2729sub update {
2127 my ($self) = @_; 2730 my ($self) = @_;
2128 2731
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2732 delete $self->{knob_w};
2733 $self->SUPER::update;
2734}
2735
2736sub _draw {
2737 my ($self) = @_;
2738
2739 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2740 $self->set_value ($self->{range}[0]);
2131 2741
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2742 my ($value, $lo, $hi, $page) = @{$self->{range}};
2743 my $range = ($hi - $page - $lo) || 1e-100;
2133 2744
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2745 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2746
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2747 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2748 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2749
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2750 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2751 $value = $value * $self->{scale} + $self->{offset};
2140 2752
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; 2753 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2754 $self->{knob_w} = $knob_w;
2148 }); 2755 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2756
2156 $self->SUPER::_draw (); 2757 $self->SUPER::_draw ();
2157 2758
2158 glScale $self->{w}, $self->{h}; 2759 glScale $self->{w}, $self->{h};
2159 2760
… …
2179 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2180} 2781}
2181 2782
2182############################################################################# 2783#############################################################################
2183 2784
2184package CFClient::UI::TextView; 2785package CFPlus::UI::ValSlider;
2185 2786
2186our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2187 2788
2789sub new {
2790 my ($class, %arg) = @_;
2791
2792 my $range = delete $arg{range};
2793
2794 my $self = $class->SUPER::new (
2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2797 to_value => sub { shift },
2798 from_value => sub { shift },
2799 %arg,
2800 );
2801
2802 $self->{slider}->connect (changed => sub {
2803 my ($self, $value) = @_;
2804 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2805 $self->{parent}->emit (changed => $value);
2806 });
2807
2808# $self->{entry}->connect (changed => sub {
2809# my ($self, $value) = @_;
2810# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2811# $self->{parent}->emit (changed => $value);
2812# });
2813
2814 $self->add ($self->{slider}, $self->{entry});
2815
2816 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2817
2818 $self
2819}
2820
2821sub set_range { shift->{slider}->set_range (@_) }
2822sub set_value { shift->{slider}->set_value (@_) }
2823
2824#############################################################################
2825
2826package CFPlus::UI::TextScroller;
2827
2828our @ISA = CFPlus::UI::HBox::;
2829
2188use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2189 2831
2190sub new { 2832sub new {
2191 my $class = shift; 2833 my $class = shift;
2192 2834
2193 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2194 fontsize => 1, 2836 fontsize => 1,
2195 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2196 #font => default_font 2839 #font => default_font
2197 @_, 2840 @_,
2198 2841
2199 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2200 par => [], 2843 par => [],
2844 max_par => 0,
2201 height => 0, 2845 height => 0,
2202 children => [ 2846 children => [
2203 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2204 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2205 ], 2849 ],
2206 ); 2850 );
2207 2851
2208 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2209 2853
… …
2215 2859
2216 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2217 $self->reflow; 2861 $self->reflow;
2218} 2862}
2219 2863
2864sub size_request {
2865 my ($self) = @_;
2866
2867 my ($empty, $slider) = @{ $self->{children} };
2868
2869 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request
2871}
2872
2220sub size_allocate { 2873sub invoke_size_allocate {
2221 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2222 2875
2223 $self->SUPER::size_allocate ($w, $h); 2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2224 2878
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2228 2883
2229 $self->reflow; 2884 $self->reflow;
2230}
2231 2885
2232sub text_height { 2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2233 my ($self, $text, $indent) = @_; 2891 my ($self, $ev) = @_;
2892
2893 return 0 unless $ev->{dy}; # only vertical movements
2894
2895 $self->{children}[1]->emit (mouse_wheel => $ev);
2896
2897 1
2898}
2899
2900sub get_layout {
2901 my ($self, $para) = @_;
2234 2902
2235 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2236 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2910 $layout->set_markup ($para->{markup});
2911
2912 $layout->set_shapes (
2913 map
2914 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2915 @{$para->{widget}}
2240 2916 );
2241 ($layout->size)[1] 2917
2918 $layout
2242} 2919}
2243 2920
2244sub reflow { 2921sub reflow {
2245 my ($self) = @_; 2922 my ($self) = @_;
2246 2923
2247 $self->{need_reflow}++; 2924 $self->{need_reflow}++;
2248 $self->update; 2925 $self->update;
2249} 2926}
2250 2927
2928sub set_offset {
2929 my ($self, $offset) = @_;
2930
2931 # todo: base offset on lines or so, not on pixels
2932 $self->{children}[1]->set_value ($offset);
2933}
2934
2935sub current_paragraph {
2936 my ($self) = @_;
2937
2938 $self->{top_paragraph} - 1
2939}
2940
2941sub scroll_to {
2942 my ($self, $para) = @_;
2943
2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2945
2946 $self->{scroll_to} = $para;
2947 $self->update;
2948}
2949
2950sub clear {
2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2955
2956 $self->{par} = [];
2957 $self->{height} = 0;
2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2959}
2960
2251sub add_paragraph { 2961sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2253 2963
2254 #TODO: intelligently "reformat" paragraph 2964 for my $para (@_) {
2965 $para = {
2966 fg => [1, 1, 1, 1],
2967 indent => 0,
2968 markup => "",
2969 widget => [],
2970 ref $para ? %$para : (markup => $para),
2971 w => 1e10,
2972 wrapped => 1,
2973 };
2255 2974
2256 for my $line (split /\n/, $text) { 2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2257 my $height = $self->text_height ($line); 2976 push @{$self->{par}}, $para;
2977 }
2978
2979 if (my $max = $self->{max_par}) {
2980 shift @{$self->{par}} while @{$self->{par}} > $max;
2981 }
2982
2983 $self->{need_reflow}++;
2984 $self->update;
2985}
2986
2987sub scroll_to_bottom {
2988 my ($self) = @_;
2989
2990 $self->{scroll_to} = $#{$self->{par}};
2991 $self->update;
2992}
2993
2994sub force_uptodate {
2995 my ($self) = @_;
2996
2997 if (delete $self->{need_reflow}) {
2998 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2999
3000 my $height = 0;
3001
3002 for my $para (@{$self->{par}}) {
3003 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3004 my $layout = $self->get_layout ($para);
3005 my ($w, $h) = $layout->size;
3006
3007 $para->{w} = $w + $para->{indent};
3008 $para->{h} = $h;
3009 $para->{wrapped} = $layout->has_wrapped;
3010 }
3011
3012 $para->{y} = $height;
3013 $height += $para->{h};
3014 }
3015
2258 $self->{height} += $height; 3016 $self->{height} = $height;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2260 }
2261 3018
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3019 delete $self->{texture};
2263 $self->{children}[1]->update; 3020 }
3021
3022 if (my $paridx = delete $self->{scroll_to}) {
3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2264} 3025}
2265 3026
2266sub update { 3027sub update {
2267 my ($self) = @_; 3028 my ($self) = @_;
2268 3029
… …
2270 3031
2271 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2272 3033
2273 delete $self->{texture}; 3034 delete $self->{texture};
2274 3035
2275 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
2276 if (delete $self->{need_reflow}) { 3037 $self->force_uptodate;
2277 my $height = 0;
2278 3038
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2280 for @{$self->{par}};
2281 3040
2282 $self->{height} = $height; 3041 $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; 3042 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2293 3044
3045 package CFPlus::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
3048
2294 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2295 3050
3051 my $paridx = 0;
3052 my $top_paragraph;
3053 my $top = int $self->{children}[1]{range}[0];
3054
2296 my $y0 = $top; 3055 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 3056 my $y1 = $top + $H;
2298 3057
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}}) { 3058 for my $para (@{$self->{par}}) {
2309 my $h = $par->[0]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2310 3061
2311 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 3063 my $layout = $self->get_layout ($para);
2313 $layout->set_width ($self->{w} - $par->[2]);
2314 $layout->set_markup ($par->[3]);
2315 3064
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2317 3066
2318 glRasterPos $par->[2], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3068 my @s = $layout->get_shapes;
3069
3070 for (@w) {
3071 my ($dx, $dy) = splice @s, 0, 2, ();
3072
3073 $_->{x} = $dx + $para->{indent};
3074 $_->{y} = $dy + $y - $y0;
3075
3076 $_->draw;
3077 }
3078 }
2320 } 3079 }
2321 3080
2322 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2323 } 3083 }
2324 3084
2325 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2326 }; 3086 };
2327 }); 3087 });
2328} 3088}
2329 3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
3097}
3098
2330sub _draw { 3099sub _draw {
2331 my ($self) = @_; 3100 my ($self) = @_;
2332 3101
2333 glEnable GL_TEXTURE_2D; 3102 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 3104 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3105 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2338 3107
2339 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2340
2341} 3109}
2342 3110
2343############################################################################# 3111#############################################################################
2344 3112
2345package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2346 3114
2347use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2348 3116
2349our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2350 3118
2351sub moveto { 3119sub moveto {
2352 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2353 3121
2354 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2382 glPopMatrix; 3150 glPopMatrix;
2383} 3151}
2384 3152
2385############################################################################# 3153#############################################################################
2386 3154
2387package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2388 3156
2389our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2390 3158
2391sub new { 3159sub new {
2392 my $class = shift; 3160 my $class = shift;
2393 3161
2394 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
2395 state => 0, 3163 state => 0,
2396 connect_activate => \&toggle_flopper, 3164 on_activate => \&toggle_flopper,
2397 @_ 3165 @_
2398 ); 3166 );
2399 3167
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 3168 $self
2406} 3169}
2407 3170
2408sub toggle_flopper { 3171sub toggle_flopper {
2409 my ($self) = @_; 3172 my ($self) = @_;
2410 3173
2411 # TODO: use animation 3174 $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} 3175}
2423 3176
2424############################################################################# 3177#############################################################################
2425 3178
2426package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2427 3180
2428our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2429 3182
2430use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2431 3184
2432sub new { 3185sub new {
2433 my $class = shift; 3186 my $class = shift;
2434 3187
2435 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2439} 3192}
2440 3193
2441sub set_tooltip_from { 3194sub set_tooltip_from {
2442 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
2443 3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
3199
3200 my $tooltip = $widget->{tooltip};
3201
3202 if ($ENV{CFPLUS_DEBUG} & 2) {
3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3205 . "req $widget->{req_w} $widget->{req_h}\n"
3206 . "visible $widget->{visible}";
3207 }
3208
3209 $tooltip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//;
3211
2444 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2445 markup => $widget->{tooltip}, 3213 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 3215 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2449 ellipsise => 0, 3217 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2451 ); 3219 );
2452} 3220}
2453 3221
… …
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458 3226
2459 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2460} 3228}
2461 3229
2462sub size_allocate { 3230sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2464 3232
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 3233 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3234}
3235
3236sub invoke_visibility_change {
3237 my ($self, $visible) = @_;
3238
3239 return unless $visible;
3240
3241 $self->{root}->on_post_alloc ("move_$self" => sub {
3242 my $widget = $self->{owner}
3243 or return;
3244
3245 if ($widget->{visible}) {
3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3247
3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3249 if $x + $self->{w} > $self->{root}{w};
3250
3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
3255 });
2466} 3256}
2467 3257
2468sub _draw { 3258sub _draw {
2469 my ($self) = @_; 3259 my ($self) = @_;
2470 3260
… …
2487 glVertex $w, $h; 3277 glVertex $w, $h;
2488 glVertex $w, 0; 3278 glVertex $w, 0;
2489 glEnd; 3279 glEnd;
2490 3280
2491 glTranslate 2 - 0.375, 2 - 0.375; 3281 glTranslate 2 - 0.375, 2 - 0.375;
3282
2492 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2493} 3284}
2494 3285
2495############################################################################# 3286#############################################################################
2496 3287
2497package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2498 3289
2499our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2500 3291
2501use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2502 3293
2503sub new { 3294sub new {
2504 my $class = shift; 3295 my $class = shift;
2505 3296
2506 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
2507 aspect => 1, 3298 aspect => 1,
3299 can_events => 0,
2508 @_, 3300 @_,
2509 ); 3301 );
2510 3302
2511 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2513 3305
2514 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2515 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2516 hard => 1, 3308 hard => 1,
2517 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2527 3319
2528sub size_request { 3320sub size_request {
2529 (32, 8) 3321 (32, 8)
2530} 3322}
2531 3323
3324sub update {
3325 my ($self) = @_;
3326
3327 return unless $self->{visible};
3328
3329 $self->SUPER::update;
3330}
3331
2532sub _draw { 3332sub _draw {
2533 my ($self) = @_; 3333 my ($self) = @_;
2534 3334
2535 return unless $::CONN;#d# manage and cache textures differently 3335 return unless $::CONN;
3336
3337 $self->SUPER::_draw;
2536 3338
2537 my $face; 3339 my $face;
2538 3340
2539 if ($self->{frame}) { 3341 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 3349
2548 if ($tex) { 3350 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 3351 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 3353 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2554 } 3356 }
2555} 3357}
2556 3358
2557sub DESTROY { 3359sub destroy {
2558 my ($self) = @_; 3360 my ($self) = @_;
2559 3361
2560 $self->{timer}->cancel 3362 $self->{timer}->cancel
2561 if $self->{timer}; 3363 if $self->{timer};
2562 3364
2563 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
2564} 3366}
2565 3367
2566############################################################################# 3368#############################################################################
2567 3369
2568package CFClient::UI::InventoryItem; 3370package CFPlus::UI::Buttonbar;
2569 3371
2570our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2571 3373
2572sub _item_to_desc { 3374# 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 3375
2676############################################################################# 3376#############################################################################
2677 3377
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; 3378package CFPlus::UI::Menu;
2724 3379
2725our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2726 3381
2727use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2728 3383
2729sub new { 3384sub new {
2730 my $class = shift; 3385 my $class = shift;
2731 3386
2732 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2733 items => [], 3388 items => [],
2734 z => 100, 3389 z => 100,
2735 @_, 3390 @_,
2736 ); 3391 );
2737 3392
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2739 3394
2740 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2742 3397
2743 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2744 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2745 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2746 can_hover => 1, 3404 can_hover => 1,
2747 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
2748 text => $widget; 3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2749 } 3420 }
2750 3421
2751 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2752 3423
2753 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2765 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3437 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2768 3439
2769 $self->show; 3440 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3441 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 3442}
2772 3443
2773sub mouse_motion { 3444sub invoke_mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2775 3446
2776 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2779}
2780 3450
3451 0
3452}
3453
2781sub button_up { 3454sub invoke_button_up {
2782 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2783 3456
2784 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3458 undef $GRAB;
2786 $self->hide; 3459 $self->hide;
2787 3460
2788 $self->emit ("popdown"); 3461 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
3463 } else {
3464 return 0
3465 }
3466
2790 } 3467 1
2791} 3468}
2792 3469
2793############################################################################# 3470#############################################################################
2794 3471
2795package CFClient::UI::Statusbox; 3472package CFPlus::UI::Multiplexer;
2796 3473
2797our @ISA = CFClient::UI::VBox::; 3474our @ISA = CFPlus::UI::Container::;
2798 3475
2799sub new { 3476sub new {
2800 my $class = shift; 3477 my $class = shift;
2801 3478
2802 $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
3480 @_,
3481 );
3482
3483 $self->{current} = $self->{children}[0]
3484 if @{ $self->{children} };
3485
3486 $self
3487}
3488
3489sub add {
3490 my ($self, @widgets) = @_;
3491
3492 $self->SUPER::add (@widgets);
3493
3494 $self->{current} = $self->{children}[0]
3495 if @{ $self->{children} };
3496}
3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3504sub set_current_page {
3505 my ($self, $page_or_widget) = @_;
3506
3507 my $widget = ref $page_or_widget
3508 ? $page_or_widget
3509 : $self->{children}[$page_or_widget];
3510
3511 $self->{current} = $widget;
3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3513
3514 $self->emit (page_changed => $self->{current});
3515
3516 $self->realloc;
3517}
3518
3519sub visible_children {
3520 $_[0]{current}
3521}
3522
3523sub size_request {
3524 my ($self) = @_;
3525
3526 $self->{current}->size_request
3527}
3528
3529sub invoke_size_allocate {
3530 my ($self, $w, $h) = @_;
3531
3532 $self->{current}->configure (0, 0, $w, $h);
3533
3534 1
3535}
3536
3537sub _draw {
3538 my ($self) = @_;
3539
3540 $self->{current}->draw;
3541}
3542
3543#############################################################################
3544
3545package CFPlus::UI::Notebook;
3546
3547our @ISA = CFPlus::UI::VBox::;
3548
3549sub new {
3550 my $class = shift;
3551
3552 my $self = $class->SUPER::new (
3553 buttonbar => (new CFPlus::UI::Buttonbar),
3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3555 # filter => # will be put between multiplexer and $self
3556 @_,
3557 );
3558
3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3560 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3561
3562 $self
3563}
3564
3565sub add {
3566 my ($self, $title, $widget, $tooltip) = @_;
3567
3568 CFPlus::weaken $self;
3569
3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3571 markup => $title,
3572 tooltip => $tooltip,
3573 on_activate => sub { $self->set_current_page ($widget) },
3574 );
3575
3576 $self->{multiplexer}->add ($widget);
3577}
3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3585sub set_current_page {
3586 my ($self, $page) = @_;
3587
3588 $self->{multiplexer}->set_current_page ($page);
3589 $self->emit (page_changed => $self->{multiplexer}{current});
3590}
3591
3592#############################################################################
3593
3594package CFPlus::UI::Selector;
3595
3596use utf8;
3597
3598our @ISA = CFPlus::UI::Button::;
3599
3600sub new {
3601 my $class = shift;
3602
3603 my $self = $class->SUPER::new (
3604 options => [], # [value, title, longdesc], ...
3605 value => undef,
3606 @_,
3607 );
3608
3609 $self->_set_value ($self->{value});
3610
3611 $self
3612}
3613
3614sub invoke_button_down {
3615 my ($self, $ev) = @_;
3616
3617 my @menu_items;
3618
3619 for (@{ $self->{options} }) {
3620 my ($value, $title, $tooltip) = @$_;
3621
3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3623 }
3624
3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3626}
3627
3628sub _set_value {
3629 my ($self, $value) = @_;
3630
3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3632 or return;
3633
3634 $self->{value} = $item->[0];
3635 $self->set_markup ("$item->[1] ⇓");
3636 $self->set_tooltip ($item->[2]);
3637}
3638
3639sub set_value {
3640 my ($self, $value) = @_;
3641
3642 return unless $self->{value} ne $value;
3643
3644 $self->_set_value ($value);
3645 $self->emit (changed => $value);
3646}
3647
3648#############################################################################
3649
3650package CFPlus::UI::Statusbox;
3651
3652our @ISA = CFPlus::UI::VBox::;
3653
3654sub new {
3655 my $class = shift;
3656
3657 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3658 fontsize => 0.8,
2804 @_, 3659 @_,
2805 ) 3660 );
3661
3662 CFPlus::weaken (my $this = $self);
3663
3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3665
3666 $self
2806} 3667}
2807 3668
2808sub reorder { 3669sub reorder {
2809 my ($self) = @_; 3670 my ($self) = @_;
2810 my $NOW = time; 3671 my $NOW = Time::HiRes::time;
3672
3673 # freeze display when hovering over any label
3674 return if $CFPlus::UI::TOOLTIP->{owner}
3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3676 values %{ $self->{item} };
2811 3677
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3680 }
2815 3681
… …
2818 my @items = sort { 3684 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3685 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3686 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3687 } values %{ $self->{item} };
2822 3688
3689 $self->{timer}->interval (1);
3690
2823 my $count = 10 + 1; 3691 my $count = 10 + 1;
2824 for my $item (@items) { 3692 for my $item (@items) {
2825 last unless --$count; 3693 last unless --$count;
2826 3694
2827 push @widgets, $item->{label} ||= do { 3695 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3696 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3697 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3698 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3699 : $item->{text};
2832 3700
2833 for ($short) { 3701 for ($short) {
2834 s/^\s+//; 3702 s/^\s+//;
2835 s/\s+/ /g; 3703 s/\s+/ /g;
2836 } 3704 }
2837 3705
2838 new CFClient::UI::Label 3706 new CFPlus::UI::Label
2839 markup => $short, 3707 markup => $short,
2840 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3712 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3713 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3714 can_events => 1,
2847 can_hover => 1 3715 can_hover => 1
2848 }; 3716 };
3717
3718 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3719 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3720 $label->update;
3721 $label->set_max_size (undef, $label->{req_h} * $diff)
3722 if $diff < 1;
3723 $self->{timer}->interval (1/30);
3724 } else {
3725 $label->{fg}[3] = $item->{fg}[3] || 1;
3726 }
3727
3728 push @widgets, $label;
2849 } 3729 }
2850 3730
2851 $self->clear; 3731 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3732 $self->SUPER::add (reverse @widgets);
2853} 3733}
… …
2856 my ($self, $text, %arg) = @_; 3736 my ($self, $text, %arg) = @_;
2857 3737
2858 $text =~ s/^\s+//; 3738 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3739 $text =~ s/\s+$//;
2860 3740
3741 return unless $text;
3742
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3743 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3744
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3745 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3746
2865 if (my $item = $self->{item}{$group}) { 3747 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3748 if ($item->{text} eq $text) {
2867 $item->{count}++; 3749 $item->{count}++;
2868 } else { 3750 } else {
2869 $item->{count} = 1; 3751 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
2871 } 3753 }
2872 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3756 delete $item->{label};
2875 } else { 3757 } else {
2876 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
2883 count => 1, 3765 count => 1,
2884 %arg, 3766 %arg,
2885 }; 3767 };
2886 } 3768 }
2887 3769
3770 $ROOT->on_refresh (reorder => sub {
2888 $self->reorder; 3771 $self->reorder;
3772 });
2889} 3773}
2890 3774
2891sub reconfigure { 3775sub reconfigure {
2892 my ($self) = @_; 3776 my ($self) = @_;
2893 3777
… …
2896 3780
2897 $self->reorder; 3781 $self->reorder;
2898 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
2899} 3783}
2900 3784
3785sub destroy {
3786 my ($self) = @_;
3787
3788 $self->{timer}->cancel;
3789
3790 $self->SUPER::destroy;
3791}
3792
2901############################################################################# 3793#############################################################################
2902 3794
2903package CFClient::UI::Root; 3795package CFPlus::UI::Root;
2904 3796
2905our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
2906 3798
3799use List::Util qw(min max);
3800
2907use CFClient::OpenGL; 3801use CFPlus::OpenGL;
2908 3802
2909sub new { 3803sub new {
2910 my $class = shift; 3804 my $class = shift;
2911 3805
2912 $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3807 visible => 1,
2913 @_, 3808 @_,
2914 ) 3809 );
2915}
2916 3810
2917sub configure { 3811 CFPlus::weaken ($self->{root} = $self);
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3812
2920 $self->{w} = $w; 3813 $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} 3814}
2930 3815
2931sub size_request { 3816sub size_request {
2932 my ($self) = @_; 3817 my ($self) = @_;
2933 3818
2934 ($self->{w}, $self->{h}) 3819 ($self->{w}, $self->{h})
2935} 3820}
2936 3821
3822sub _to_pixel {
3823 my ($coord, $size, $max) = @_;
3824
3825 $coord =
3826 $coord eq "center" ? ($max - $size) * 0.5
3827 : $coord eq "max" ? $max
3828 : $coord;
3829
3830 $coord = 0 if $coord < 0;
3831 $coord = $max - $size if $coord > $max - $size;
3832
3833 int $coord + 0.5
3834}
3835
2937sub size_allocate { 3836sub invoke_size_allocate {
2938 my ($self, $w, $h) = @_; 3837 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 3838
2946 for my $child ($self->children) { 3839 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3840 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3841
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3842 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3843 $Y = $child->{force_y} if exists $child->{force_y};
2951 3844
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3845 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3846 $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 3847
2958 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
2959 } 3849 }
3850
3851 1
2960} 3852}
2961 3853
2962sub coord2local { 3854sub coord2local {
2963 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
2964 3856
… …
2972} 3864}
2973 3865
2974sub update { 3866sub update {
2975 my ($self) = @_; 3867 my ($self) = @_;
2976 3868
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3869 $::WANT_REFRESH++;
2979} 3870}
2980 3871
2981sub add { 3872sub add {
2982 my ($self, @children) = @_; 3873 my ($self, @children) = @_;
2983 3874
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3875 $_->{is_toplevel} = 1
2986 3876 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3877
2992 $self->SUPER::add (@children); 3878 $self->SUPER::add (@children);
3879}
3880
3881sub remove {
3882 my ($self, @children) = @_;
3883
3884 $self->SUPER::remove (@children);
3885
3886 delete $self->{is_toplevel}
3887 for @children;
3888
3889 while (@children) {
3890 my $w = pop @children;
3891 push @children, $w->children;
3892 $w->set_invisible;
3893 }
2993} 3894}
2994 3895
2995sub on_refresh { 3896sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3897 my ($self, $id, $cb) = @_;
2997 3898
… …
3010 while ($self->{refresh_hook}) { 3911 while ($self->{refresh_hook}) {
3011 $_->() 3912 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3913 for values %{delete $self->{refresh_hook}};
3013 } 3914 }
3014 3915
3015 if ($self->{check_size}) { 3916 if ($self->{realloc}) {
3016 my @queue = ([], []); 3917 my %queue;
3918 my @queue;
3919 my $widget;
3017 3920
3018 for (;;) { 3921 outer:
3019 if ($self->{check_size}) { 3922 while () {
3020 # heuristic: check containers last 3923 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3924 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3925 $widget->{visible} or next; # do not resize invisible widgets
3926
3927 $queue{$widget+0}++ and next; # duplicates are common
3928
3929 push @{ $queue[$widget->{visible}] }, $widget;
3930 }
3023 } 3931 }
3024 3932
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3933 while () {
3934 @queue or last outer;
3026 3935
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3936 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3937 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 3938
3939 pop @queue;
3940 }
3941
3942 delete $queue{$widget+0};
3943
3944 my ($w, $h) = $widget->size_request;
3945
3946 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3947 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3948
3949 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3950 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3951
3952 $w = $widget->{force_w} if exists $widget->{force_w};
3953 $h = $widget->{force_h} if exists $widget->{force_h};
3954
3955 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3956 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3957 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3958 $widget->{req_h} = $h;
3037 3959
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3960 $self->{size_alloc}{$widget+0} = $widget;
3039 3961
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3962 if (my $parent = $widget->{parent}) {
3963 $self->{realloc}{$parent+0} = $parent
3964 unless $queue{$parent+0};
3965
3966 $parent->{force_size_alloc} = 1;
3967 $self->{size_alloc}{$parent+0} = $parent;
3968 }
3042 } 3969 }
3970
3971 delete $self->{realloc}{$widget+0};
3043 } 3972 }
3044 } 3973 }
3045 3974
3046 while ($self->{size_alloc}) { 3975 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3976 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3977 values %$size_alloc;
3978
3979 while () {
3980 my $widget = pop @queue || last;
3981
3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3983
3050 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3052 3986
3987 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h;
3989
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995
3996 $w = int $w + 0.5;
3997 $h = int $h + 0.5;
3998
3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4000 $widget->{old_w} = $widget->{w};
4001 $widget->{old_h} = $widget->{h};
4002
3053 $widget->{w} = $w; 4003 $widget->{w} = $w;
3054 $widget->{h} = $h; 4004 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 4005
3056 $widget->emit (size_allocate => $w, $h); 4006 $widget->emit (size_allocate => $w, $h);
4007 }
3057 } 4008 }
3058 } 4009 }
3059 4010
3060 while ($self->{post_alloc_hook}) { 4011 while ($self->{post_alloc_hook}) {
3061 $_->() 4012 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 4013 for values %{delete $self->{post_alloc_hook}};
3063 } 4014 }
4015
3064 4016
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4017 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 4019 glClear GL_COLOR_BUFFER_BIT;
3068 4020
… …
3070 glLoadIdentity; 4022 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 4025 glLoadIdentity;
3074 4026
4027 {
4028 package CFPlus::UI::Base;
4029
4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4031 (0, 0, $self->{w}, $self->{h});
4032
3075 $self->_draw; 4033 $self->_draw;
4034 }
3076} 4035}
3077 4036
3078############################################################################# 4037#############################################################################
3079 4038
3080package CFClient::UI; 4039package CFPlus::UI;
3081 4040
3082$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3083$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3084 4043
30851 40441
3086 4045

Diff Legend

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