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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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