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.216 by root, Fri May 19 16:43:57 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) = @_;
… …
136 $rem += $_ - $i; 167 $rem += $_ - $i;
137 $_ = $i; 168 $_ = $i;
138 } 169 }
139} 170}
140 171
172sub full_refresh {
173 # make a copy, otherwise for complains about freed values.
174 my @widgets = values %WIDGET;
175
176 $_->update
177 for @widgets;
178}
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
141# call when resolution changes etc. 188# call when resolution changes etc.
142sub rescale_widgets { 189sub rescale_widgets {
143 my ($sx, $sy) = @_; 190 my ($sx, $sy) = @_;
144 191
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 192 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 207 }
159
160 $widget->reconfigure;
161 } 208 }
209
210 reconfigure_widgets;
162} 211}
163 212
164############################################################################# 213#############################################################################
165 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
166package CFClient::UI::Base; 223package CFPlus::UI::Base;
167 224
168use strict; 225use strict;
169 226
170use CFClient::OpenGL; 227use CFPlus::OpenGL;
171 228
172sub new { 229sub new {
173 my $class = shift; 230 my $class = shift;
174 231
175 my $self = bless { 232 my $self = bless {
176 x => 0, 233 x => "center",
177 y => 0, 234 y => "center",
178 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
179 can_events => 1, 238 can_events => 1,
180 @_ 239 @_
181 }, $class; 240 }, $class;
182 241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
243
183 for (keys %$self) { 244 for (keys %$self) {
184 if (/^connect_(.*)$/) { 245 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
186 } 247 }
187 } 248 }
188 249
189 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 }
190 261
191 $self 262 $self
192} 263}
193 264
194sub destroy { 265sub destroy {
195 my ($self) = @_; 266 my ($self) = @_;
196 267
197 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
198 %$self = (); 270 %$self = ();
199} 271}
200 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
201sub show { 277sub show {
202 my ($self) = @_; 278 my ($self) = @_;
203 279
204 return if $self->{parent}; 280 return if $self->{parent};
205 281
206 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
207} 283}
208 284
209sub hide { 285sub set_visible {
210 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};
211 309
212 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
216 if $self->{parent}; 343 if $self->{parent};
217} 344}
218 345
219sub move { 346sub move_abs {
220 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
221 348
222 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
225 352
226 $self->update; 353 $self->update;
227} 354}
228 355
229sub set_size { 356sub set_size {
230 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
231 358
232 $self->{user_w} = $w; 359 $self->{force_w} = $w;
233 $self->{user_h} = $h; 360 $self->{force_h} = $h;
234 361
235 $self->check_size; 362 $self->realloc;
236} 363}
237 364
238sub size_request { 365sub size_request {
239 require Carp; 366 require Carp;
240 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
241} 368}
242 369
370sub baseline_shift {
371 0
372}
373
243sub configure { 374sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
245 376
246 if ($self->{aspect}) { 377 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h);
379
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
249 382
250 # use alignment to adjust x, y 383 # use alignment to adjust x, y
251 384
252 $x += int +($w - $w2) * 0.5; 385 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 386 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 387 }
257 388
258 if ($self->{x} != $x || $self->{y} != $y) { 389 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 390 $self->{x} = $x;
260 $self->{y} = $y; 391 $self->{y} = $y;
261 $self->update; 392 $self->update;
262 } 393 }
263 394
264 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 396 return unless $self->{visible};
266 }
267}
268 397
269sub size_allocate { 398 $self->{alloc_w} = $w;
270 # nothing to be done 399 $self->{alloc_h} = $h;
271}
272 400
273sub reconfigure { 401 $self->{root}{size_alloc}{$self+0} = $self;
274 my ($self) = @_; 402 }
275
276 $self->check_size (1);
277 $self->update;
278} 403}
279 404
280sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
281} 411}
282 412
283sub set_max_size { 413sub set_max_size {
284 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
285 415
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
288} 420}
289 421
290sub set_tooltip { 422sub set_tooltip {
291 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
292 424
425 $tooltip =~ s/^\s+//;
426 $tooltip =~ s/\s+$//;
427
428 return if $self->{tooltip} eq $tooltip;
429
293 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
294 431
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
298 } 435 }
299} 436}
300 437
301# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
302sub coord2local { 439sub coord2local {
303 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
304 441
442 Carp::confess unless $self->{parent};#d#
443
305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
306} 445}
307 446
308# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
309sub coord2global { 448sub coord2global {
310 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
311 450
451 Carp::confess unless $self->{parent};#d#
452
312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313} 454}
314 455
315sub focus_in { 456sub invoke_focus_in {
316 my ($self) = @_; 457 my ($self) = @_;
317 458
318 return if $FOCUS == $self; 459 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
320 461
321 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
322 463
323 $self->emit (focus_in => $focus); 464 $self->update;
324 465
325 $focus->update if $focus; 466 0
326 $FOCUS->update;
327} 467}
328 468
329sub focus_out { 469sub invoke_focus_out {
330 my ($self) = @_; 470 my ($self) = @_;
331 471
332 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
333 473
334 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
335 475
336 $self->emit (focus_out => $focus); 476 $self->update;
337 477
338 $focus->update if $focus; #? 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339} 479 unless $FOCUS;
340 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
341sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
342sub button_up { } 492sub invoke_button_up { 0 }
343sub key_down { } 493sub invoke_key_down { 0 }
344sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
345 496
346sub button_down { 497sub invoke_button_down {
347 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
348 499
349 $self->focus_in; 500 $self->grab_focus;
350}
351 501
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 504
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 505sub connect {
356sub 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
357 602
358sub draw { 603sub draw {
359 my ($self) = @_; 604 my ($self) = @_;
360 605
361 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);
362 615
363 glPushMatrix; 616 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 618
368 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 621 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 623 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 624 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 625 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 626 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 627 glVertex 0 , $self->{h};
392 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;
393 glPopMatrix; 642 glPopMatrix;
394 #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;
395 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
396} 648}
397 649
398sub _draw { 650sub _draw {
399 my ($self) = @_; 651 my ($self) = @_;
400 652
401 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
402} 654}
403 655
404sub find_widget { 656my $cntx;#d#
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450}
451
452sub DESTROY { 657sub DESTROY {
453 my ($self) = @_; 658 my ($self) = @_;
454 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
455 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
456 #$self->deactivate;
457} 666}
458 667
459############################################################################# 668#############################################################################
460 669
461package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
462 671
463our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
464 673
465use strict; 674use strict;
466use CFClient::OpenGL; 675use CFPlus::OpenGL;
467 676
468sub new { 677sub new {
469 my $class = shift; 678 my $class = shift;
470 679
471 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
486 695
487 if ($color && (@$color < 4 || $color->[3])) { 696 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
489 698
490 glEnable GL_BLEND; 699 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 701 glColor_premultiply @$color;
493 702
494 glBegin GL_QUADS; 703 glBegin GL_QUADS;
495 glVertex 0 , 0; 704 glVertex 0 , 0;
496 glVertex 0 , $h; 705 glVertex 0 , $h;
497 glVertex $w, $h; 706 glVertex $w, $h;
… …
502 } 711 }
503} 712}
504 713
505############################################################################# 714#############################################################################
506 715
507package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
508 717
509our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
510 719
511sub new { 720sub new {
512 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
514} 723}
515 724
516sub size_request { 725sub size_request {
517 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
518} 729}
519 730
520sub draw { } 731sub draw { }
521 732
522############################################################################# 733#############################################################################
523 734
524package CFClient::UI::Container; 735package CFPlus::UI::Container;
525 736
526our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
527 738
528sub new { 739sub new {
529 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
530 741
531 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
532 743
533 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
534 children => [], 745 children => [],
535 can_events => 0, 746 can_events => 0,
536 %arg, 747 %arg,
537 ); 748 );
749
538 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
539 752
540 $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;
541} 762}
542 763
543sub add { 764sub add {
544 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
545 766
… …
551 $self->{children} = [ 772 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 773 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 774 @{$self->{children}}, @widgets
554 ]; 775 ];
555 776
556 $self->check_size (1); 777 $self->realloc;
557 $self->update;
558} 778}
559 779
560sub children { 780sub children {
561 @{ $_[0]{children} } 781 @{ $_[0]{children} }
562} 782}
… …
567 delete $child->{parent}; 787 delete $child->{parent};
568 $child->hide; 788 $child->hide;
569 789
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 791
572 $self->check_size; 792 $self->realloc;
573 $self->update;
574} 793}
575 794
576sub clear { 795sub clear {
577 my ($self) = @_; 796 my ($self) = @_;
578 797
… …
582 for (@$children) { 801 for (@$children) {
583 delete $_->{parent}; 802 delete $_->{parent};
584 $_->hide; 803 $_->hide;
585 } 804 }
586 805
587 $self->check_size; 806 $self->realloc;
588 $self->update;
589} 807}
590 808
591sub find_widget { 809sub find_widget {
592 my ($self, $x, $y) = @_; 810 my ($self, $x, $y) = @_;
593 811
594 $x -= $self->{x}; 812 $x -= $self->{x};
595 $y -= $self->{y}; 813 $y -= $self->{y};
596 814
597 my $res; 815 my $res;
598 816
599 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
601 and return $res; 819 and return $res;
602 } 820 }
603 821
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
610 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
611} 829}
612 830
613############################################################################# 831#############################################################################
614 832
615package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
616 834
617our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
618 836
619sub new { 837sub new {
620 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
621 839
622 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
623 841
624 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
625} 843}
626 844
627sub add { 845sub add {
628 my ($self, $child) = @_; 846 my ($self, $child) = @_;
629 847
630 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
631
632 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
633} 850}
634 851
635sub remove { 852sub remove {
636 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
637 854
638 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
639 856
640 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
641 unless @{$self->{children}}; 858 unless @{$self->{children}};
642} 859}
643 860
644sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
645 862
646sub size_request { 863sub size_request {
647 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
648} 865}
649 866
650sub size_allocate { 867sub invoke_size_allocate {
651 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
652 869
653 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
654} 873}
655 874
656############################################################################# 875#############################################################################
657 876
877# back-buffered drawing area
878
658package CFClient::UI::Window; 879package CFPlus::UI::Window;
659 880
660our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
661 882
662use CFClient::OpenGL; 883use CFPlus::OpenGL;
663 884
664sub new { 885sub new {
665 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
666 887
667 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
672 893
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 895 $self->SUPER::update;
675} 896}
676 897
677sub size_allocate { 898sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
679 900
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
682} 904}
683 905
684sub _render { 906sub _render {
907 my ($self) = @_;
908
685 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
686} 910}
687 911
688sub render_child { 912sub render_child {
689 my ($self) = @_; 913 my ($self) = @_;
690 914
691 $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 {
692 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 925 $self->_render;
926 }
696 }; 927 };
697} 928}
698 929
699sub _draw { 930sub _draw {
700 my ($self) = @_; 931 my ($self) = @_;
701
702 my ($w, $h) = ($self->w, $self->h);
703 932
704 my $tex = $self->{texture} 933 my $tex = $self->{texture}
705 or return; 934 or return;
706 935
707 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
710 939
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
712 941
713 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
714} 943}
715 944
716############################################################################# 945#############################################################################
717 946
718package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
719 948
720our @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}
721 960
722sub size_request { 961sub size_request {
723 my ($self) = @_; 962 my ($self) = @_;
724 963
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 965
728 @$self{qw(child_w child_h)} 966 $w = 10 if $self->{scroll_x};
729} 967 $h = 10 if $self->{scroll_y};
730 968
969 ($w, $h)
970}
971
731sub size_allocate { 972sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 981 $self->update;
982
983 1
735} 984}
736 985
737sub set_offset { 986sub set_offset {
738 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
739 988
… …
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) { 1016 ) {
768 $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})
769 } else { 1018 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
771 } 1020 }
772} 1021}
773 1022
774sub _render { 1023sub _render {
775 my ($self) = @_; 1024 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 1030
779 $self->SUPER::_render; 1031 $self->SUPER::_render;
780} 1032}
781 1033
782############################################################################# 1034#############################################################################
783 1035
784package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
785 1037
786our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
787 1039
788sub new { 1040sub new {
789 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
790 1044
791 my $self; 1045 my $self;
792 1046
793 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
794 vertical => 1, 1048 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 1050 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1051 $self->{vp}->set_offset (0, $_[1]);
798 }, 1052 },
799 ; 1053 ;
800 1054
801 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
803 slider => $slider, 1058 slider => $slider,
804 @_, 1059 %arg,
805 ); 1060 );
806 1061
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
1063 $self->add ($child) if $child;
810 1064
811 $self 1065 $self
812} 1066}
813 1067
814#TODO# update range on size_allocate depending on child 1068#TODO# update range on size_allocate depending on child
815# 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}
816 1107
817############################################################################# 1108#############################################################################
818 1109
819package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
820 1111
821our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
822 1113
823use CFClient::OpenGL; 1114use CFPlus::OpenGL;
824 1115
825sub new { 1116sub new {
826 my $class = shift; 1117 my $class = shift;
827 1118
828 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
836 1127
837 if ($self->{bg}) { 1128 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1129 my ($w, $h) = @$self{qw(w h)};
839 1130
840 glEnable GL_BLEND; 1131 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1132 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1133 glColor_premultiply @{ $self->{bg} };
843 1134
844 glBegin GL_QUADS; 1135 glBegin GL_QUADS;
845 glVertex 0 , 0; 1136 glVertex 0 , 0;
846 glVertex 0 , $h; 1137 glVertex 0 , $h;
847 glVertex $w, $h; 1138 glVertex $w, $h;
… …
854 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
855} 1146}
856 1147
857############################################################################# 1148#############################################################################
858 1149
859package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
860 1151
861our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
862 1153
863use CFClient::OpenGL; 1154use CFPlus::OpenGL;
864
865my @tex =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1155
869sub new { 1156sub new {
870 my $class = shift; 1157 my ($class, %arg) = @_;
871 1158
872 # 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 }
873 1166
874 my $self = $class->SUPER::new ( 1167 my $self = $class->SUPER::new (
1168 # label => "",
875 bg => [1, 1, 1, 1], 1169 fg => [0.6, 0.3, 0.1],
876 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1170 border => 0.8,
878 toplevel => 1, 1171 style => 'single',
879 can_events => 1, 1172 %arg,
880 @_
881 ); 1173 );
882 1174
883 $self->{title} &&= new CFClient::UI::Label
884 align => 0,
885 valign => 1,
886 text => $self->{title},
887 fontsize => $self->{border};
888
889 $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};
890} 1183}
891 1184
892sub border { 1185sub border {
893 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
894} 1187}
895 1188
896sub size_request { 1189sub size_request {
897 my ($self) = @_; 1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
898 1194
899 my ($w, $h) = $self->SUPER::size_request; 1195 my ($w, $h) = $self->SUPER::size_request;
900 1196
901 ( 1197 (
902 $w + $self->border * 2, 1198 $w + $self->border * 2,
903 $h + $self->border * 2, 1199 $h + $self->border * 2,
904 ) 1200 )
905} 1201}
906 1202
907sub size_allocate { 1203sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
909 1205
910 $h -= List::Util::max 0, $self->border * 2; 1206 my $border = $self->border;
1207
911 $w -= List::Util::max 0, $self->border * 2; 1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
912 1210
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1211 if (my $label = $self->{label}) {
914 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 }
915 1216
916 $self->child->configure ($self->border, $self->border, $w, $h); 1217 $self->child->configure ($border, $border, $w, $h);
917}
918 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
919sub button_down { 1355sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
921 1357
922 my ($w, $h) = @$self{qw(w h)}; 1358 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1359 my $border = $self->border;
924 1360
… …
937 my ($ev, $x, $y) = @_; 1373 my ($ev, $x, $y) = @_;
938 1374
939 my $dx = $ev->{x} - $ox; 1375 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1376 my $dy = $ev->{y} - $oy;
941 1377
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1378 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1379 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1380
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1381 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1382 $self->realloc;
946 }; 1383 };
947 1384
948 } elsif ($lr ^ $td) { 1385 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1386 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1387 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1389 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1390 my ($ev, $x, $y) = @_;
954 1391
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1392 ($x, $y) = ($ev->{x}, $ev->{y});
956 1393
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1394 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1395 # HACK: the next line is required to enforce placement
1396 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1397 };
1398 } else {
1399 return 0;
1400 }
1401
960 } 1402 1
961} 1403}
962 1404
963sub button_up { 1405sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
965 1407
966 delete $self->{motion}; 1408 ! ! delete $self->{motion}
967} 1409}
968 1410
969sub mouse_motion { 1411sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1412 my ($self, $ev, $x, $y) = @_;
971 1413
972 $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
973} 1425}
974 1426
975sub _draw { 1427sub _draw {
976 my ($self) = @_; 1428 my ($self) = @_;
977 1429
1430 my $child = $self->{children}[0];
1431
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1432 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1433 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1434
981 glEnable GL_TEXTURE_2D; 1435 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1437
984 my $border = $self->border; 1438 my $border = $self->border;
985 1439
986 glColor @{ $self->{border_bg} }; 1440 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1441 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1445
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1447 glColor @{ $self->{bg} };
994 1448
995 # TODO: repeat texture not scale 1449 # TODO: repeat texture not scale
1450 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1451 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1452 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1453 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1454 }
1006 1455
1007 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1008 1457
1009 $self->{title}->draw if $self->{title};
1010
1011 $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};
1012} 1469}
1013 1470
1014############################################################################# 1471#############################################################################
1015 1472
1016package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1017 1474
1018our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1019 1476
1020use List::Util qw(max sum); 1477use List::Util qw(max sum);
1021 1478
1022use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1023 1480
1024sub new { 1481sub new {
1025 my $class = shift; 1482 my $class = shift;
1026 1483
1027 $class->SUPER::new ( 1484 $class->SUPER::new (
1028 col_expand => [], 1485 col_expand => [],
1029 @_ 1486 @_,
1030 ) 1487 )
1031}
1032
1033sub add {
1034 my ($self, $x, $y, $child) = @_;
1035
1036 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child;
1038
1039 $child->check_size;
1040} 1488}
1041 1489
1042sub children { 1490sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044} 1492}
1045 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
1046# 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?
1047sub clear { 1515sub clear {
1048 my ($self) = @_; 1516 my ($self) = @_;
1049 1517
1050 my @children = $self->children; 1518 my @children = $self->children;
1051 delete $self->{children}; 1519 delete $self->{children};
… …
1053 for (@children) { 1521 for (@children) {
1054 delete $_->{parent}; 1522 delete $_->{parent};
1055 $_->hide; 1523 $_->hide;
1056 } 1524 }
1057 1525
1058 $self->update; 1526 $self->realloc;
1059} 1527}
1060 1528
1061sub get_wh { 1529sub get_wh {
1062 my ($self) = @_; 1530 my ($self) = @_;
1063 1531
… …
1089 (sum @$ws), 1557 (sum @$ws),
1090 (sum @$hs), 1558 (sum @$hs),
1091 ) 1559 )
1092} 1560}
1093 1561
1094sub size_allocate { 1562sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1563 my ($self, $w, $h) = @_;
1096 1564
1097 my ($ws, $hs) = $self->get_wh; 1565 my ($ws, $hs) = $self->get_wh;
1098 1566
1099 my $req_w = sum @$ws; 1567 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1568 my $req_h = (sum @$hs) || 1;
1101 1569
1102 # TODO: nicer code && do row_expand 1570 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1571 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1572 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1573 my $col_expand = (sum @col_expand) || 1;
1106 1574
1107 # linearly scale sizes 1575 # linearly scale sizes
1108 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1109 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1110 1578
1111 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1112 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1113 1581
1114 my $y; 1582 my $y;
1115 1583
1116 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1117 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1131 } 1599 }
1132 1600
1133 $y += $row_h; 1601 $y += $row_h;
1134 } 1602 }
1135 1603
1604 1
1136} 1605}
1137 1606
1138sub find_widget { 1607sub find_widget {
1139 my ($self, $x, $y) = @_; 1608 my ($self, $x, $y) = @_;
1140 1609
… …
1159 } 1628 }
1160} 1629}
1161 1630
1162############################################################################# 1631#############################################################################
1163 1632
1164package CFClient::UI::HBox; 1633package CFPlus::UI::Box;
1165 1634
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1169 1636
1170sub size_request { 1637sub size_request {
1171 my ($self) = @_; 1638 my ($self) = @_;
1172 1639
1173 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}
1174 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 }
1175 ( 1676 }
1176 (List::Util::sum map $_->[0], @alloc), 1677
1177 (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 @_,
1178 ) 1703 )
1179} 1704}
1180 1705
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1706#############################################################################
1223 1707
1224package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1225 1709
1226# TODO: wrap into common Box base class 1710our @ISA = CFPlus::UI::Box::;
1227 1711
1228our @ISA = CFClient::UI::Container::; 1712sub new {
1713 my $class = shift;
1229 1714
1230sub size_request { 1715 $class->SUPER::new (
1231 my ($self) = @_; 1716 vertical => 1,
1232 1717 @_,
1233 my @alloc = map [$_->size_request], @{$self->{children}};
1234
1235 (
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1718 )
1239} 1719}
1240 1720
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278}
1279
1280############################################################################# 1721#############################################################################
1281 1722
1282package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1283 1724
1284our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1285 1726
1286use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1287 1728
1288sub new { 1729sub new {
1289 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1290 1731
1291 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1294 #active_bg => none 1735 #active_bg => none
1295 #font => default_font 1736 #font => default_font
1296 #text => initial text 1737 #text => initial text
1297 #markup => initial narkup 1738 #markup => initial narkup
1298 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1299 ellipsise => 3, # end 1741 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1301 fontsize => 1, 1743 fontsize => 1,
1302 align => -1, 1744 align => -1,
1303 valign => -1, 1745 valign => -1,
1304 padding => 2, 1746 padding_x => 2,
1747 padding_y => 2,
1305 can_events => 0, 1748 can_events => 0,
1306 %arg 1749 %arg
1307 ); 1750 );
1308 1751
1309 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1310 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1311 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1312 $self->{template} = $layout; 1755 $self->{template} = $layout;
1313 } 1756 }
1314 1757
1315 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1319 } 1762 }
1320 1763
1321 $self 1764 $self
1322} 1765}
1323 1766
1324sub escape($) {
1325 local $_ = $_[0];
1326
1327 s/&/&amp;/g;
1328 s/>/&gt;/g;
1329 s/</&lt;/g;
1330
1331 $_
1332}
1333
1334sub update { 1767sub update {
1335 my ($self) = @_; 1768 my ($self) = @_;
1336 1769
1337 delete $self->{texture}; 1770 delete $self->{texture};
1338 $self->SUPER::update; 1771 $self->SUPER::update;
1339} 1772}
1340 1773
1774sub realloc {
1775 my ($self) = @_;
1776
1777 delete $self->{ox};
1778 $self->SUPER::realloc;
1779}
1780
1341sub set_text { 1781sub set_text {
1342 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1343 1783
1344 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1346 1786
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1349 1788
1789 delete $self->{size_req};
1790 $self->realloc;
1350 $self->update; 1791 $self->update;
1351 $self->check_size;
1352} 1792}
1353 1793
1354sub set_markup { 1794sub set_markup {
1355 my ($self, $markup) = @_; 1795 my ($self, $markup) = @_;
1356 1796
1357 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1359 1799
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1801
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1364 1803
1804 delete $self->{size_req};
1805 $self->realloc;
1365 $self->update; 1806 $self->update;
1366 $self->check_size;
1367} 1807}
1368 1808
1369sub size_request { 1809sub size_request {
1370 my ($self) = @_; 1810 my ($self) = @_;
1371 1811
1812 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1814 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1815 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1818
1378 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1379 1820
1380 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1381 $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);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1825
1384 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1385 1827
1386 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1830 }
1831
1832 [$w, $h]
1388 } 1833 };
1389 1834
1390 ( 1835 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1836}
1395 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1396sub size_allocate { 1842sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1398 1844
1845 delete $self->{ox};
1846
1399 delete $self->{texture}; 1847 delete $self->{texture}
1848 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1849
1850 1
1400} 1851}
1401 1852
1402sub set_fontsize { 1853sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1404 1855
1405 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1406 delete $self->{texture}; 1858 delete $self->{texture};
1407 1859
1408 $self->update; 1860 $self->realloc;
1409 $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;
1410} 1870}
1411 1871
1412sub _draw { 1872sub _draw {
1413 my ($self) = @_; 1873 my ($self) = @_;
1414 1874
1415 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1416 1876
1417 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1884
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1885 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1886 };
1437 1887
1438 glEnable GL_TEXTURE_2D; 1888 unless (exists $self->{ox}) {
1439 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);
1440 1892
1441 if ($tex->{format} == GL_ALPHA) { 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1895 : ($self->{h} - $size->[1]) * 0.5);
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 } 1896 };
1447 1897
1448 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});
1449} 1902}
1450 1903
1451############################################################################# 1904#############################################################################
1452 1905
1453package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1454 1907
1455our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1456 1909
1457use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1458 1911
1459sub new { 1912sub new {
1460 my $class = shift; 1913 my $class = shift;
1461 1914
1462 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1466 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1467 can_hover => 1, 1920 can_hover => 1,
1468 can_focus => 1, 1921 can_focus => 1,
1469 valign => 0, 1922 valign => 0,
1470 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1925 #text => ...
1926 #hidden => "*",
1471 @_ 1927 @_
1472 ) 1928 )
1473} 1929}
1474 1930
1475sub _set_text { 1931sub _set_text {
… …
1477 1933
1478 delete $self->{cur_h}; 1934 delete $self->{cur_h};
1479 1935
1480 return if $self->{text} eq $text; 1936 return if $self->{text} eq $text;
1481 1937
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1939 $self->{text} = $text;
1486 1940
1487 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1943 delete $self->{size_req};
1489 1944
1490 $self->emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1946
1947 $self->realloc;
1948 $self->update;
1491} 1949}
1492 1950
1493sub set_text { 1951sub set_text {
1494 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1495 1953
1496 $self->{cursor} = length $text; 1954 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1955 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 1956}
1501 1957
1502sub get_text { 1958sub get_text {
1503 $_[0]{text} 1959 $_[0]{text}
1504} 1960}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1510 1966
1511 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1512} 1968}
1513 1969
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 1970sub invoke_key_down {
1521 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1522 1972
1523 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1526 1976
1527 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;
1528 1980
1529 if ($uni == 8) { 1981 if ($uni == 8) {
1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1531 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1532 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1533 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1534 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1535 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1536 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1537 } 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 = "";
1538 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 2005 $self->emit ('escape');
1543 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
2010 } else {
2011 return 0;
1545 } 2012 }
1546 2013
1547 $self->_set_text ($text); 2014 $self->_set_text ($text);
2015
2016 $self->realloc;
1548 $self->update; 2017 $self->update;
1549 $self->check_size;
1550}
1551 2018
2019 1
2020}
2021
1552sub focus_in { 2022sub invoke_focus_in {
1553 my ($self) = @_; 2023 my ($self) = @_;
1554 2024
1555 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1556 2026
1557 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1558} 2028}
1559 2029
1560sub button_down { 2030sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1562 2032
1563 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 2034
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 2036
1567 # byte-index to char-index 2037 # byte-index to char-index
1568 my $text = $self->{text}; 2038 my $text = $self->{text};
1569 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1571 2041
1572 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1573 $self->update; 2043 $self->update;
2044
2045 1
1574} 2046}
1575 2047
1576sub mouse_motion { 2048sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 2053}
1580 2054
1581sub _draw { 2055sub _draw {
1582 my ($self) = @_; 2056 my ($self) = @_;
1583 2057
1584 local $self->{fg} = $self->{fg}; 2058 local $self->{fg} = $self->{fg};
1585 2059
1586 if ($FOCUS == $self) { 2060 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 2061 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 2062 $self->{fg} = $self->{active_fg};
1589 } else { 2063 } else {
1590 glColor @{$self->{bg}}; 2064 glColor_premultiply @{$self->{bg}};
1591 } 2065 }
1592 2066
1593 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 2069 glBegin GL_QUADS;
1596 glVertex 0 , 0; 2070 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 2071 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 2072 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 2073 glVertex $self->{w}, 0;
… …
1610 utf8::encode $text; 2084 utf8::encode $text;
1611 2085
1612 @$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)
1613 } 2087 }
1614 2088
1615 glColor @{$self->{fg}};
1616 glBegin GL_LINES; 2089 glBegin GL_LINES;
1617 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};
1618 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};
1619 glEnd; 2092 glEnd;
1620 } 2093 }
1621} 2094}
1622 2095
2096#############################################################################
2097
1623package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1624 2099
1625our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1626 2101
1627use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1628 2103
1629sub key_down { 2104sub invoke_key_down {
1630 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1631 2106
1632 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1633 2108
1634 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1635 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1637 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 2115 $self->emit (activate => $txt);
1640 $self->update; 2116 $self->update;
1641 2117
1642 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1645 } 2121 }
1646 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1649 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 } 2126 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 } 2128 }
1653 2129
1654 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1655 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657 2133
1658 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else { 2136 } else {
1661 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1662 } 2138 }
1663 2139
1664 } else { 2140 } else {
1665 $self->SUPER::key_down ($ev); 2141 return $self->SUPER::invoke_key_down ($ev)
2142 }
2143
1666 } 2144 1
1667
1668} 2145}
1669 2146
1670############################################################################# 2147#############################################################################
1671 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
1672package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1673 2189
1674our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1675 2191
1676use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1677 2193
1678my @tex = 2194my @tex =
1679 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1680 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1681 2197
1682sub new { 2198sub new {
1683 my $class = shift; 2199 my $class = shift;
1684 2200
1685 $class->SUPER::new ( 2201 $class->SUPER::new (
1686 padding => 4, 2202 padding_x => 4,
2203 padding_y => 4,
1687 fg => [1, 1, 1], 2204 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 2205 active_fg => [0, 0, 1],
1689 can_hover => 1, 2206 can_hover => 1,
1690 align => 0, 2207 align => 0,
1691 valign => 0, 2208 valign => 0,
1692 can_events => 1, 2209 can_events => 1,
1693 @_ 2210 @_
1694 ) 2211 )
1695} 2212}
1696 2213
1697sub button_up { 2214sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1699 2216
2217 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 2219 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 2220
1703 } 2221 1
1704} 2222}
1705 2223
1706sub _draw { 2224sub _draw {
1707 my ($self) = @_; 2225 my ($self) = @_;
1708 2226
1709 local $self->{fg} = $self->{fg}; 2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 2228
1715 glEnable GL_TEXTURE_2D; 2229 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 2231 glColor 0, 0, 0, 1;
1718 2232
… …
1723 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1724} 2238}
1725 2239
1726############################################################################# 2240#############################################################################
1727 2241
1728package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1729 2243
1730our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1731 2245
1732my @tex = 2246my @tex =
1733 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1734 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1735 2249
1736use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1737 2251
1738sub new { 2252sub new {
1739 my $class = shift; 2253 my $class = shift;
1740 2254
1741 $class->SUPER::new ( 2255 $class->SUPER::new (
1742 padding => 2, 2256 padding_x => 2,
2257 padding_y => 2,
1743 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2259 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2260 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2261 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2262 state => 0,
… …
1751} 2266}
1752 2267
1753sub size_request { 2268sub size_request {
1754 my ($self) = @_; 2269 my ($self) = @_;
1755 2270
1756 ($self->{padding} * 2 + 6) x 2 2271 (6) x 2
1757} 2272}
1758 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1759sub button_down { 2282sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1761 2284
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2287 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2288 } else {
2289 return 0
2290 }
2291
1766 } 2292 1
1767} 2293}
1768 2294
1769sub _draw { 2295sub _draw {
1770 my ($self) = @_; 2296 my ($self) = @_;
1771 2297
1772 $self->SUPER::_draw; 2298 $self->SUPER::_draw;
1773 2299
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2301
1776 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;
1777 2305
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2306 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2307
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2308 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2309
… …
1784 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
1785} 2313}
1786 2314
1787############################################################################# 2315#############################################################################
1788 2316
1789package CFClient::UI::Image; 2317package CFPlus::UI::Image;
1790 2318
1791our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
1792 2320
1793use CFClient::OpenGL; 2321use CFPlus::OpenGL;
1794use Carp qw/confess/;
1795 2322
1796our %loaded_images; 2323our %texture_cache;
1797 2324
1798sub new { 2325sub new {
1799 my $class = shift; 2326 my $class = shift;
1800 2327
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
1802 2332
1803 $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";
1804 2335
1805 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 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;
1807 2338
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
1809 2340
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2342
1814 $self 2343 $self
1815} 2344}
1816 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
1817sub size_request { 2361sub size_request {
1818 my ($self) = @_; 2362 my ($self) = @_;
1819 2363
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
1821} 2365}
1822 2366
1823sub _draw { 2367sub _draw {
1824 my ($self) = @_; 2368 my ($self) = @_;
1825 2369
… …
1835 } 2379 }
1836 2380
1837 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 2383
1840 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
1841 2385
1842 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
1843} 2387}
1844 2388
1845############################################################################# 2389#############################################################################
1846 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
1847package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
1848 2428
1849our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
1850 2430
1851use List::Util qw(min max); 2431use List::Util qw(min max);
1852 2432
1853use CFClient::OpenGL; 2433use CFPlus::OpenGL;
1854 2434
1855my %tex = ( 2435my %tex = (
1856 food => [ 2436 food => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859 ], 2439 ],
1860 grace => [ 2440 grace => [
1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1862 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/
1863 ], 2443 ],
1864 hp => [ 2444 hp => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867 ], 2447 ],
1868 mana => [ 2448 mana => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1870 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/
1871 ], 2451 ],
1872); 2452);
1873 2453
1874# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2516
1937 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
1938 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);
1939 2522
1940 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2528
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2529 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2530 glBegin GL_QUADS;
… …
1961 2545
1962 if ($t3) { 2546 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2553 glEnd;
1970 } 2554 }
1971 2555
1972 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
1973 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
1974} 2558}
1975 2559
1976############################################################################# 2560#############################################################################
1977 2561
1978package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
1979 2563
1980our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
1981 2565
1982sub new { 2566sub new {
1983 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
1984 2568
1985 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
1987 can_hover => 1, 2571 can_hover => 1,
1988 can_events => 1, 2572 can_events => 1,
1989 %arg, 2573 %arg,
1990 ); 2574 );
1991 2575
1992 $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");
1993 $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);
1994 $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");
1995 2579
1996 $self 2580 $self
1997} 2581}
1998 2582
1999sub set_fontsize { 2583sub set_fontsize {
… …
2020 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2021} 2605}
2022 2606
2023############################################################################# 2607#############################################################################
2024 2608
2025package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2026 2610
2027use strict; 2611use strict;
2028 2612
2029use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2030 2614
2031our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2032 2616
2033my @tex = 2617my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2035 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2036 2620
2037sub new { 2621sub new {
2038 my $class = shift; 2622 my $class = shift;
2039 2623
… …
2045 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2630 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2631 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2632 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2633 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2634 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2635 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2636 min_h => $::WIDTH / 80,
2053 vertical => 0, 2637 vertical => 0,
2054 can_hover => 1, 2638 can_hover => 1,
2055 inner_pad => .05, 2639 inner_pad => 0.02,
2056 @_ 2640 @_
2057 ); 2641 );
2058 2642
2059 $self->set_value ($self->{range}[0]); 2643 $self->set_value ($self->{range}[0]);
2060 $self->update; 2644 $self->update;
2061 2645
2062 $self 2646 $self
2063} 2647}
2064 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
2065sub set_value { 2660sub set_value {
2066 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2067 2662
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2663 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2664
2070 $hi = $lo + 1 if $hi <= $lo; 2665 $hi = $lo + 1 if $hi <= $lo;
2071 2666
2667 $page = $hi - $lo if $page > $hi - $lo;
2668
2072 $value = $lo if $value < $lo; 2669 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2670 $value = $hi - $page if $value > $hi - $page;
2074 2671
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2672 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2673 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2674
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2676
2082 if ($value != $old_value) { 2677 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2678 $self->emit (changed => $value);
… …
2086} 2681}
2087 2682
2088sub size_request { 2683sub size_request {
2089 my ($self) = @_; 2684 my ($self) = @_;
2090 2685
2091 my $w = $self->{req_w}; 2686 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2687}
2096 2688
2097sub button_down { 2689sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2099 2691
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2102} 2697}
2103 2698
2104sub mouse_motion { 2699sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2106 2701
2107 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2704
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2705 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2706
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2707 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2708
2114 $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
2115 } 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
2116} 2727}
2117 2728
2118sub update { 2729sub update {
2119 my ($self) = @_; 2730 my ($self) = @_;
2120 2731
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2740 $self->set_value ($self->{range}[0]);
2123 2741
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2742 my ($value, $lo, $hi, $page) = @{$self->{range}};
2743 my $range = ($hi - $page - $lo) || 1e-100;
2125 2744
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2745 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2746
2128 $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;
2129 2749
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2750 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2751 $value = $value * $self->{scale} + $self->{offset};
2132 2752
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2753 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2754 $self->{knob_w} = $knob_w;
2140 }); 2755 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2756
2148 $self->SUPER::_draw (); 2757 $self->SUPER::_draw ();
2149 2758
2150 glScale $self->{w}, $self->{h}; 2759 glScale $self->{w}, $self->{h};
2151 2760
… …
2171 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2172} 2781}
2173 2782
2174############################################################################# 2783#############################################################################
2175 2784
2176package CFClient::UI::TextView; 2785package CFPlus::UI::ValSlider;
2177 2786
2178our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2179 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
2180use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2181 2831
2182sub new { 2832sub new {
2183 my $class = shift; 2833 my $class = shift;
2184 2834
2185 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2186 fontsize => 1, 2836 fontsize => 1,
2187 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2188 #font => default_font 2839 #font => default_font
2189 @_, 2840 @_,
2190 2841
2191 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2192 par => [], 2843 par => [],
2844 max_par => 0,
2193 height => 0, 2845 height => 0,
2194 children => [ 2846 children => [
2195 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2197 ], 2849 ],
2198 ); 2850 );
2199 2851
2200 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2201 2853
… …
2207 2859
2208 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2861 $self->reflow;
2210} 2862}
2211 2863
2212sub text_height { 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
2873sub invoke_size_allocate {
2874 my ($self, $w, $h) = @_;
2875
2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2878
2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2881 $self->{layout}->set_width ($empty->{w});
2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2883
2884 $self->reflow;
2885
2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2213 my ($self, $text) = @_; 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) = @_;
2214 2902
2215 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2216 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $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}}
2220 2916 );
2221 ($layout->size)[1] 2917
2918 $layout
2222} 2919}
2223 2920
2224sub reflow { 2921sub reflow {
2225 my ($self) = @_; 2922 my ($self) = @_;
2226 2923
2227 $self->{need_reflow}++; 2924 $self->{need_reflow}++;
2228 $self->update; 2925 $self->update;
2229} 2926}
2230 2927
2231sub size_allocate { 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 {
2232 my ($self, $w, $h) = @_; 2942 my ($self, $para) = @_;
2233 2943
2234 $self->SUPER::size_allocate ($w, $h); 2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2235 2945
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2946 $self->{scroll_to} = $para;
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2947 $self->update;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2948}
2239 2949
2240 $self->reflow; 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]);
2241} 2959}
2242 2960
2243sub add_paragraph { 2961sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2962 my $self = shift;
2245 2963
2246 #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 };
2247 2974
2248 my $height = $self->text_height ($text); 2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2976 push @{$self->{par}}, $para;
2977 }
2249 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
2250 $self->{height} += $height; 3016 $self->{height} = $height;
3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2251 3018
2252 push @{$self->{par}}, [$height, $color, $text]; 3019 delete $self->{texture};
3020 }
2253 3021
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3022 if (my $paridx = delete $self->{scroll_to}) {
2255 $self->{children}[1]->update; 3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2256} 3025}
2257 3026
2258sub update { 3027sub update {
2259 my ($self) = @_; 3028 my ($self) = @_;
2260 3029
… …
2262 3031
2263 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2264 3033
2265 delete $self->{texture}; 3034 delete $self->{texture};
2266 3035
2267 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
2268 if (delete $self->{need_reflow}) { 3037 $self->force_uptodate;
2269 my $height = 0;
2270 3038
2271 $height += $_->[0] = $self->text_height ($_->[2]) 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2272 for @{$self->{par}};
2273 3040
2274 $self->{height} = $height; 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2275
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2277
2278 delete $self->{texture};
2279 }
2280
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 3042 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2284 3044
2285 glEnable GL_TEXTURE_2D; 3045 package CFPlus::UI::Base;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
2287 3048
2288 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2289 3050
3051 my $paridx = 0;
3052 my $top_paragraph;
3053 my $top = int $self->{children}[1]{range}[0];
3054
2290 my $y0 = $top; 3055 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 3056 my $y1 = $top + $H;
2292 3057
2293 my $y = 0;
2294
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2301 3061
2302 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 3063 my $layout = $self->get_layout ($para);
2304 $layout->set_markup ($par->[2]);
2305 3064
2306 my ($W, $H) = $layout->size; 3065 $layout->render ($para->{indent}, $y - $y0);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3066
3067 if (my @w = @{ $para->{widget} }) {
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 }
2308 } 3079 }
2309 3080
2310 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2311 } 3083 }
2312 3084
2313 glDisable GL_TEXTURE_2D; 3085 $self->{top_paragraph} = $top_paragraph;
2314 }; 3086 };
2315 }); 3087 });
2316} 3088}
2317 3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
3097}
3098
2318sub _draw { 3099sub _draw {
2319 my ($self) = @_; 3100 my ($self) = @_;
2320 3101
2321 glEnable GL_TEXTURE_2D; 3102 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 3104 glColor 0, 0, 0, 1;
2324 $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});
2325 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2326 3107
2327 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2328
2329} 3109}
2330 3110
2331############################################################################# 3111#############################################################################
2332 3112
2333package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2334 3114
2335use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2336 3116
2337our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2338 3118
2339sub moveto { 3119sub moveto {
2340 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2341 3121
2342 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2370 glPopMatrix; 3150 glPopMatrix;
2371} 3151}
2372 3152
2373############################################################################# 3153#############################################################################
2374 3154
2375package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2376 3156
2377our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2378 3158
2379sub new { 3159sub new {
2380 my $class = shift; 3160 my $class = shift;
2381 3161
2382 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
2383 state => 0, 3163 state => 0,
2384 connect_activate => \&toggle_flopper, 3164 on_activate => \&toggle_flopper,
2385 @_ 3165 @_
2386 ); 3166 );
2387 3167
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 3168 $self
2394} 3169}
2395 3170
2396sub toggle_flopper { 3171sub toggle_flopper {
2397 my ($self) = @_; 3172 my ($self) = @_;
2398 3173
2399 # TODO: use animation 3174 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 3175}
2411 3176
2412############################################################################# 3177#############################################################################
2413 3178
2414package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2415 3180
2416our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2417 3182
2418use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2419 3184
2420sub new { 3185sub new {
2421 my $class = shift; 3186 my $class = shift;
2422 3187
2423 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2427} 3192}
2428 3193
2429sub set_tooltip_from { 3194sub set_tooltip_from {
2430 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2433 markup => $widget->{tooltip}, 3213 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 3215 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2437 ellipsise => 0, 3217 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 ); 3219 );
2440} 3220}
2441 3221
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 3226
2447 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2448} 3228}
2449 3229
2450sub size_allocate { 3230sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2452 3232
2453 $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 });
2454} 3256}
2455 3257
2456sub _draw { 3258sub _draw {
2457 my ($self) = @_; 3259 my ($self) = @_;
2458 3260
… …
2475 glVertex $w, $h; 3277 glVertex $w, $h;
2476 glVertex $w, 0; 3278 glVertex $w, 0;
2477 glEnd; 3279 glEnd;
2478 3280
2479 glTranslate 2 - 0.375, 2 - 0.375; 3281 glTranslate 2 - 0.375, 2 - 0.375;
3282
2480 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2481} 3284}
2482 3285
2483############################################################################# 3286#############################################################################
2484 3287
2485package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2486 3289
2487our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2488 3291
2489use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2490 3293
2491sub new { 3294sub new {
2492 my $class = shift; 3295 my $class = shift;
2493 3296
2494 $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
2495 aspect => 1, 3298 aspect => 1,
3299 can_events => 0,
2496 @_, 3300 @_,
2497 ) 3301 );
3302
3303 if ($self->{anim} && $self->{animspeed}) {
3304 CFPlus::weaken (my $widget = $self);
3305
3306 $self->{timer} = Event->timer (
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308 hard => 1,
3309 interval => $self->{animspeed},
3310 cb => sub {
3311 ++$widget->{frame};
3312 $widget->update;
3313 },
3314 );
3315 }
3316
3317 $self
2498} 3318}
2499 3319
2500sub size_request { 3320sub size_request {
2501 (32, 8) 3321 (32, 8)
2502} 3322}
2503 3323
3324sub update {
3325 my ($self) = @_;
3326
3327 return unless $self->{visible};
3328
3329 $self->SUPER::update;
3330}
3331
2504sub _draw { 3332sub _draw {
2505 my ($self) = @_; 3333 my ($self) = @_;
2506 3334
2507 return unless $::CONN;#d# manage and cache textures differently 3335 return unless $::CONN;
3336
3337 $self->SUPER::_draw;
3338
3339 my $face;
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 3349
2510 # TODO animation
2511 if ($tex) { 3350 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3351 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3353 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2517 } 3356 }
2518} 3357}
2519 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel
3363 if $self->{timer};
3364
3365 $self->SUPER::destroy;
3366}
3367
2520############################################################################# 3368#############################################################################
2521 3369
2522package CFClient::UI::InventoryItem; 3370package CFPlus::UI::Buttonbar;
2523 3371
2524our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2525 3373
2526sub _item_to_desc { 3374# TODO: should actually wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624 3375
2625############################################################################# 3376#############################################################################
2626 3377
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2673 3379
2674our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2675 3381
2676use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2677 3383
2678sub new { 3384sub new {
2679 my $class = shift; 3385 my $class = shift;
2680 3386
2681 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2682 items => [], 3388 items => [],
2683 z => 100, 3389 z => 100,
2684 @_, 3390 @_,
2685 ); 3391 );
2686 3392
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2688 3394
2689 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2691 3397
2692 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2693 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2694 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2695 can_hover => 1, 3404 can_hover => 1,
2696 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,
2697 text => $widget; 3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2698 } 3420 }
2699 3421
2700 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2701 3423
2702 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3437 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2717 3439
2718 $self->show; 3440 $self->show;
2719 $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);
2720} 3442}
2721 3443
2722sub mouse_motion { 3444sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2724 3446
2725 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3450
3451 0
3452}
3453
2730sub button_up { 3454sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2732 3456
2733 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3458 undef $GRAB;
2735 $self->hide; 3459 $self->hide;
2736 3460
2737 $self->emit ("popdown"); 3461 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
3463 } else {
3464 return 0
3465 }
3466
2739 } 3467 1
2740} 3468}
2741 3469
2742############################################################################# 3470#############################################################################
2743 3471
2744package CFClient::UI::Statusbox; 3472package CFPlus::UI::Multiplexer;
2745 3473
2746our @ISA = CFClient::UI::VBox::; 3474our @ISA = CFPlus::UI::Container::;
2747 3475
2748sub new { 3476sub new {
2749 my $class = shift; 3477 my $class = shift;
2750 3478
2751 $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 (
2752 fontsize => 0.8, 3658 fontsize => 0.8,
2753 @_, 3659 @_,
2754 ) 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
2755} 3667}
2756 3668
2757sub reorder { 3669sub reorder {
2758 my ($self) = @_; 3670 my ($self) = @_;
2759 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} };
2760 3677
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3680 }
2764 3681
… …
2767 my @items = sort { 3684 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3685 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3686 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3687 } values %{ $self->{item} };
2771 3688
3689 $self->{timer}->interval (1);
3690
2772 my $count = 10 + 1; 3691 my $count = 10 + 1;
2773 for my $item (@items) { 3692 for my $item (@items) {
2774 last unless --$count; 3693 last unless --$count;
2775 3694
2776 push @widgets, $item->{label} ||= do { 3695 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3696 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3697 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3698 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3699 : $item->{text};
2781 3700
2782 for ($short) { 3701 for ($short) {
2783 s/^\s+//; 3702 s/^\s+//;
2784 s/\s+/ /g; 3703 s/\s+/ /g;
2785 } 3704 }
2786 3705
2787 new CFClient::UI::Label 3706 new CFPlus::UI::Label
2788 markup => $short, 3707 markup => $short,
2789 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3712 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3713 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3714 can_events => 1,
2796 can_hover => 1 3715 can_hover => 1
2797 }; 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;
2798 } 3729 }
2799 3730
2800 $self->clear; 3731 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3732 $self->SUPER::add (reverse @widgets);
2802} 3733}
… …
2805 my ($self, $text, %arg) = @_; 3736 my ($self, $text, %arg) = @_;
2806 3737
2807 $text =~ s/^\s+//; 3738 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3739 $text =~ s/\s+$//;
2809 3740
3741 return unless $text;
3742
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3743 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3744
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3745 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3746
2814 if (my $item = $self->{item}{$group}) { 3747 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3748 if ($item->{text} eq $text) {
2816 $item->{count}++; 3749 $item->{count}++;
2817 } else { 3750 } else {
2818 $item->{count} = 1; 3751 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
2820 } 3753 }
2821 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3756 delete $item->{label};
2824 } else { 3757 } else {
2825 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
2832 count => 1, 3765 count => 1,
2833 %arg, 3766 %arg,
2834 }; 3767 };
2835 } 3768 }
2836 3769
3770 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 3771 $self->reorder;
3772 });
2838} 3773}
2839 3774
2840sub reconfigure { 3775sub reconfigure {
2841 my ($self) = @_; 3776 my ($self) = @_;
2842 3777
… …
2845 3780
2846 $self->reorder; 3781 $self->reorder;
2847 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
2848} 3783}
2849 3784
3785sub destroy {
3786 my ($self) = @_;
3787
3788 $self->{timer}->cancel;
3789
3790 $self->SUPER::destroy;
3791}
3792
2850############################################################################# 3793#############################################################################
2851 3794
2852package CFClient::UI::Root; 3795package CFPlus::UI::Root;
2853 3796
2854our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
2855 3798
3799use List::Util qw(min max);
3800
2856use CFClient::OpenGL; 3801use CFPlus::OpenGL;
2857 3802
2858sub new { 3803sub new {
2859 my $class = shift; 3804 my $class = shift;
2860 3805
2861 $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3807 visible => 1,
2862 @_, 3808 @_,
2863 ) 3809 );
2864}
2865 3810
2866sub configure { 3811 CFPlus::weaken ($self->{root} = $self);
2867 my ($self, $x, $y, $w, $h) = @_;
2868 3812
2869 $self->{w} = $w; 3813 $self
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878} 3814}
2879 3815
2880sub size_request { 3816sub size_request {
2881 my ($self) = @_; 3817 my ($self) = @_;
2882 3818
2883 ($self->{w}, $self->{h}) 3819 ($self->{w}, $self->{h})
2884} 3820}
2885 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
2886sub size_allocate { 3836sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 3838
2895 for my $child ($self->children) { 3839 for my $child ($self->children) {
2896 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)};
2897 3841
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3842 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3843 $Y = $child->{force_y} if exists $child->{force_y};
2900 3844
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3845 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3846 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3847
2907 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
2908 } 3849 }
3850
3851 1
2909} 3852}
2910 3853
2911sub coord2local { 3854sub coord2local {
2912 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
2913 3856
… …
2921} 3864}
2922 3865
2923sub update { 3866sub update {
2924 my ($self) = @_; 3867 my ($self) = @_;
2925 3868
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3869 $::WANT_REFRESH++;
2928} 3870}
2929 3871
2930sub add { 3872sub add {
2931 my ($self, @children) = @_; 3873 my ($self, @children) = @_;
2932 3874
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3875 $_->{is_toplevel} = 1
2935 3876 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3877
2941 $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 }
2942} 3894}
2943 3895
2944sub on_refresh { 3896sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3897 my ($self, $id, $cb) = @_;
2946 3898
… …
2959 while ($self->{refresh_hook}) { 3911 while ($self->{refresh_hook}) {
2960 $_->() 3912 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3913 for values %{delete $self->{refresh_hook}};
2962 } 3914 }
2963 3915
2964 if ($self->{check_size}) { 3916 if ($self->{realloc}) {
2965 my @queue = ([], []); 3917 my %queue;
3918 my @queue;
3919 my $widget;
2966 3920
2967 for (;;) { 3921 outer:
2968 if ($self->{check_size}) { 3922 while () {
2969 # heuristic: check containers last 3923 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3924 for $widget (values %$realloc) {
2971 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 }
2972 } 3931 }
2973 3932
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3933 while () {
3934 @queue or last outer;
2975 3935
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3936 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3937 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 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}) {
2984 $widget->{req_w} = $w; 3957 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3958 $widget->{req_h} = $h;
2986 3959
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3960 $self->{size_alloc}{$widget+0} = $widget;
2988 3961
2989 $widget->{parent}->check_size
2990 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 }
2991 } 3969 }
3970
3971 delete $self->{realloc}{$widget+0};
2992 } 3972 }
2993 } 3973 }
2994 3974
2995 while ($self->{size_alloc}) { 3975 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3976 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 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)};
2998 3983
2999 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3001 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
3002 $widget->{w} = $w; 4003 $widget->{w} = $w;
3003 $widget->{h} = $h; 4004 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 4005
3005 $widget->emit (size_allocate => $w, $h); 4006 $widget->emit (size_allocate => $w, $h);
4007 }
3006 } 4008 }
3007 } 4009 }
3008 4010
3009 while ($self->{post_alloc_hook}) { 4011 while ($self->{post_alloc_hook}) {
3010 $_->() 4012 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 4013 for values %{delete $self->{post_alloc_hook}};
3012 } 4014 }
3013 4015
4016
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4017 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 4019 glClear GL_COLOR_BUFFER_BIT;
3017 4020
3018 glMatrixMode GL_PROJECTION; 4021 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 4022 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 4025 glLoadIdentity;
3023 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
3024 $self->_draw; 4033 $self->_draw;
4034 }
3025} 4035}
3026 4036
3027############################################################################# 4037#############################################################################
3028 4038
3029package CFClient::UI; 4039package CFPlus::UI;
3030 4040
3031$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3032$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3033 4043
30341 40441
3035 4045

Diff Legend

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