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

Diff Legend

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