ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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