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.72 by root, Tue Apr 11 18:00:45 2006 UTC vs.
Revision 1.122 by root, Mon Apr 17 19:36:27 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
16 14
17# class methods for events 15# class methods for events
18sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
26sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
27 my ($ev) = @_; 25 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29 27
30 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
32 30
33 $GRAB = $widget; 31 $GRAB = $widget;
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
58 56
59sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
60 my ($ev) = @_; 58 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62 60
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
73} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
74 93
75sub new { 94sub new {
76 my $class = shift; 95 my $class = shift;
77 96
78 bless { 97 my $self = bless {
79 x => 0, 98 x => 0,
80 y => 0, 99 y => 0,
81 z => 0, 100 z => 0,
101 w => -1,
102 h => -1,
82 @_ 103 @_
83 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
84} 113}
85 114
86sub move { 115sub move {
87 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 117 $self->{x} = int $x;
89 $self->{y} = $y; 118 $self->{y} = int $y;
90 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
91} 120}
92 121
93sub needs_redraw { 122sub needs_redraw {
94 0 123 0
97sub size_request { 126sub size_request {
98 require Carp; 127 require Carp;
99 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
100} 129}
101 130
102sub size_allocate { 131sub _size_allocate {
103 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
104 138
105 $self->{w} = $w; 139 $self->{w} = $w;
106 $self->{h} = $h; 140 $self->{h} = $h;
107}
108 141
109# translate global koordinates to local coordinate system 142 1
110sub translate { 143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
151# return top left coordinates
152sub _topleft {
111 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
112 154
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
114} 172}
115 173
116sub focus_in { 174sub focus_in {
117 my ($self) = @_; 175 my ($self) = @_;
118 176
119 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
120 179
121 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
122 $focus->update if $focus; 184 $focus->update if $focus;
123 $FOCUS->update; 185 $FOCUS->update;
124} 186}
125 187
126sub focus_out { 188sub focus_out {
127 my ($self) = @_; 189 my ($self) = @_;
128 190
129 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
130 192
131 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
132 $focus->update if $focus; #? 197 $focus->update if $focus; #?
133} 198}
134 199
135sub mouse_motion { } 200sub mouse_motion { }
136sub button_up { } 201sub button_up { }
157 glPushMatrix; 222 glPushMatrix;
158 glTranslate $self->{x}, $self->{y}, 0; 223 glTranslate $self->{x}, $self->{y}, 0;
159 $self->_draw; 224 $self->_draw;
160 glPopMatrix; 225 glPopMatrix;
161 226
162 if ($self == $HOVER) { 227 if ($self == $HOVER && $self->{can_hover}) {
163 my ($x, $y) = @$self->{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
164 229
165 glColor 1, 1, 1, 0.1; 230 glColor 1, 0.8, 0.5, 0.2;
166 glEnable GL_BLEND; 231 glEnable GL_BLEND;
232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
167 glBegin GL_QUADS; 233 glBegin GL_QUADS;
168 glVertex $x , $y; 234 glVertex $x , $y;
169 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
170 glVertex $x + $self->{w}, $y + $self->{h}; 236 glVertex $x + $self->{w}, $y + $self->{h};
171 glVertex $x , $y + $self->{h}; 237 glVertex $x , $y + $self->{h};
178 my ($self) = @_; 244 my ($self) = @_;
179 245
180 warn "no draw defined for $self\n"; 246 warn "no draw defined for $self\n";
181} 247}
182 248
183sub bbox {
184 my ($self) = @_;
185 my ($w, $h) = $self->size_request;
186 (
187 $self->{x},
188 $self->{y},
189 $self->{x} = $w,
190 $self->{y} = $h
191 )
192}
193
194sub find_widget { 249sub find_widget {
195 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
196 251
197 return $self 252 return $self
198 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 253 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
199 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 254 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
200 255
201 () 256 ()
202} 257}
203 258
204sub del_parent { $_[0]->{parent} = undef }
205
206sub set_parent { 259sub set_parent {
207 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
208 261
209 $self->{parent} = $par;
210 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
211}
212
213sub get_parent {
214 $_[0]->{parent}
215} 263}
216 264
217sub update { 265sub update {
218 my ($self) = @_; 266 my ($self) = @_;
219 267
240 #$self->deactivate; 288 #$self->deactivate;
241} 289}
242 290
243############################################################################# 291#############################################################################
244 292
245package CFClient::Widget::DrawBG; 293package CFClient::UI::DrawBG;
246 294
247our @ISA = CFClient::Widget::; 295our @ISA = CFClient::UI::Base::;
248 296
249use strict; 297use strict;
250use SDL::OpenGL; 298use SDL::OpenGL;
251 299
252sub new { 300sub new {
253 my $class = shift; 301 my $class = shift;
254 302
255 # range [value, low, high, page] 303 # range [value, low, high, page]
256 304
257 $class->SUPER::new ( 305 $class->SUPER::new (
258 bg => [0, 0, 0, 0.4], 306 bg => [0, 0, 0, 0.2],
259 active_bg => [1, 1, 1], 307 active_bg => [1, 1, 1, 0.5],
260 @_ 308 @_
261 ) 309 )
262} 310}
263 311
264sub _draw { 312sub _draw {
265 my ($self) = @_; 313 my ($self) = @_;
266 314
267 my ($w, $h) = @$self{qw(w h)}; 315 my ($w, $h) = @$self{qw(w h)};
268 316
317 glEnable GL_BLEND;
318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
269 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 319 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
320
270 glBegin GL_QUADS; 321 glBegin GL_QUADS;
271 glVertex 0 , 0; 322 glVertex 0 , 0;
272 glVertex 0 , $h; 323 glVertex 0 , $h;
273 glVertex $w, $h; 324 glVertex $w, $h;
274 glVertex $w, 0; 325 glVertex $w, 0;
275 glEnd; 326 glEnd;
276}
277 327
278############################################################################# 328 glDisable GL_BLEND;
329}
279 330
331#############################################################################
332
280package CFClient::Widget::Empty; 333package CFClient::UI::Empty;
281 334
282our @ISA = CFClient::Widget::; 335our @ISA = CFClient::UI::Base::;
283 336
284sub size_request { 337sub size_request {
285 (0, 0) 338 (0, 0)
286} 339}
287 340
288sub draw { } 341sub draw { }
289 342
290############################################################################# 343#############################################################################
291 344
292package CFClient::Widget::Container; 345package CFClient::UI::Container;
293 346
294our @ISA = CFClient::Widget::; 347our @ISA = CFClient::UI::Base::;
295 348
296sub new { 349sub new {
297 my ($class, %arg) = @_; 350 my ($class, %arg) = @_;
298 351
299 my $children = delete $arg{children} || []; 352 my $children = delete $arg{children} || [];
303 356
304 $self 357 $self
305} 358}
306 359
307sub add { 360sub add {
308 my ($self, $chld, $expand) = @_; 361 my ($self, $child) = @_;
309 362
310 $chld->{expand} = $expand;
311 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
312 366
313 $self->{children} = [ 367 $self->{children} = [
314 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
315 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
316 ]; 370 ];
317 371
318 $self->size_allocate ($self->{w}, $self->{h}) 372 $self->{w} = $self->{h} = -1;
319 if $self->{w}; #TODO: check for "realised state" 373 $self->update;
320} 374}
321 375
322sub remove { 376sub remove {
323 my ($self, $widget) = @_; 377 my ($self, $widget) = @_;
324 378
325 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
326 380
327 $self->size_allocate ($self->{w}, $self->{h}); 381 $self->size_allocate (0, 0, $self->{w}, $self->{h});
328} 382}
329 383
330sub find_widget { 384sub find_widget {
331 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
332 386
349 $_->draw for @{$self->{children}}; 403 $_->draw for @{$self->{children}};
350} 404}
351 405
352############################################################################# 406#############################################################################
353 407
354package CFClient::Widget::Bin; 408package CFClient::UI::Bin;
355 409
356our @ISA = CFClient::Widget::Container::; 410our @ISA = CFClient::UI::Container::;
357 411
358sub new { 412sub new {
359 my ($class, %arg) = @_; 413 my ($class, %arg) = @_;
360 414
361 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 415 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
362 416
363 $class->SUPER::new (children => [$child], %arg) 417 $class->SUPER::new (children => [$child], %arg)
364} 418}
365 419
366sub add { 420sub add {
374sub remove { 428sub remove {
375 my ($self, $widget) = @_; 429 my ($self, $widget) = @_;
376 430
377 $self->SUPER::remove ($widget); 431 $self->SUPER::remove ($widget);
378 432
379 $self->{children} = [new CFClient::Widget::Empty] 433 $self->{children} = [new CFClient::UI::Empty]
380 unless @{$self->{children}}; 434 unless @{$self->{children}};
381} 435}
382 436
383sub child { $_[0]->{children}[0] } 437sub child { $_[0]->{children}[0] }
384 438
385sub size_request { 439sub size_request {
386 $_[0]{children}[0]->size_request 440 $_[0]{children}[0]->size_request
387} 441}
388 442
389sub size_allocate { 443sub size_allocate {
390 my ($self, $w, $h) = @_; 444 my ($self, $x, $y, $w, $h) = @_;
391 445
392 return unless $self->{w} != $w || $self->{h} != $h; 446 $self->_size_allocate ($x, $y, $w, $h) or return;
393 447
394 $self->SUPER::size_allocate ($w, $h);
395 $self->{children}[0]->size_allocate ($w, $h); 448 $self->{children}[0]->size_allocate (0, 0, $w, $h);
396} 449}
397 450
398############################################################################# 451#############################################################################
399 452
400package CFClient::Widget::Window; 453package CFClient::UI::Window;
401 454
402our @ISA = CFClient::Widget::Bin::; 455our @ISA = CFClient::UI::Bin::;
403 456
404use SDL::OpenGL; 457use SDL::OpenGL;
405 458
406sub new { 459sub new {
407 my ($class, %arg) = @_; 460 my ($class, %arg) = @_;
418} 471}
419 472
420sub render_chld { 473sub render_chld {
421 my ($self) = @_; 474 my ($self) = @_;
422 475
423 $self->{texture} = 476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
424 CFClient::Texture->new_from_opengl ( 477 glClearColor 0, 0, 0, 1;
425 $self->{w}, $self->{h}, sub { $self->child->draw } 478 glClear GL_COLOR_BUFFER_BIT;
426 ); 479 $self->child->draw;
480 };
427} 481}
428 482
429sub size_allocate { 483sub size_allocate {
430 my ($self, $w, $h) = @_; 484 my ($self, $x, $y, $w, $h) = @_;
431 485
432 return unless $self->{w} != $w || $self->{h} != $h; 486 $self->_size_allocate ($x, $y, $w, $h) or return;
433 487
434 $self->{w} = $w;
435 $self->{h} = $h;
436
437 $self->child->size_allocate ($w, $h); 488 $self->child->size_allocate (0, 0, $w, $h);
438 489
439 $self->render_chld; 490 $self->render_chld;
440} 491}
441 492
442sub _draw { 493sub _draw {
446 497
447 my $tex = $self->{texture} 498 my $tex = $self->{texture}
448 or return; 499 or return;
449 500
450 glEnable GL_BLEND; 501 glEnable GL_BLEND;
502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glEnable GL_TEXTURE_2D; 503 glEnable GL_TEXTURE_2D;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
453 505
454 $tex->draw_quad (0, 0, $w, $h); 506 $tex->draw_quad (0, 0, $w, $h);
455 507
457 glDisable GL_TEXTURE_2D; 509 glDisable GL_TEXTURE_2D;
458} 510}
459 511
460############################################################################# 512#############################################################################
461 513
462package CFClient::Widget::Frame; 514package CFClient::UI::Frame;
463 515
464our @ISA = CFClient::Widget::Bin::; 516our @ISA = CFClient::UI::Bin::;
465 517
466use SDL::OpenGL; 518use SDL::OpenGL;
467 519
468sub size_request { 520sub size_request {
469 my ($self) = @_; 521 my ($self) = @_;
474 526
475 map { $_ + 4 } $chld->size_request; 527 map { $_ + 4 } $chld->size_request;
476} 528}
477 529
478sub size_allocate { 530sub size_allocate {
479 my ($self, $w, $h) = @_; 531 my ($self, $x, $y, $w, $h) = @_;
480 532
481 return unless $self->{w} != $w || $self->{h} != $h; 533 $self->_size_allocate ($x, $y, $w, $h) or return;
482 534
483 $self->{w} = $w;
484 $self->{h} = $h;
485
486 $self->child->size_allocate ($w - 4, $h - 4); 535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
487 $self->child->move (2, 2);
488} 536}
489 537
490sub _draw { 538sub _draw {
491 my ($self) = @_; 539 my ($self) = @_;
492 540
505 $chld->draw; 553 $chld->draw;
506} 554}
507 555
508############################################################################# 556#############################################################################
509 557
510package CFClient::Widget::FancyFrame; 558package CFClient::UI::FancyFrame;
511 559
512our @ISA = CFClient::Widget::Bin::; 560our @ISA = CFClient::UI::Bin::;
513 561
514use SDL::OpenGL; 562use SDL::OpenGL;
515 563
516my @tex = 564my @tex =
517 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
518 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
519 567
568sub new {
569 my $class = shift;
570
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new (
574 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8,
577 @_
578 )
579}
580
520sub size_request { 581sub size_request {
521 my ($self) = @_; 582 my ($self) = @_;
522 583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
523 my ($w, $h) = $self->SUPER::size_request; 586 my ($w, $h) = $self->SUPER::size_request;
524 587
525 $h += $tex[1]->{h}; 588 (
526 $h += $tex[4]->{h}; 589 $w + $self->{border} * 2,
527 $w += $tex[2]->{w}; 590 $h + $self->{border} * 2,
528 $w += $tex[3]->{w}; 591 )
529
530 ($w, $h)
531} 592}
532 593
533sub size_allocate { 594sub size_allocate {
534 my ($self, $w, $h) = @_; 595 my ($self, $x, $y, $w, $h) = @_;
535 596
536 return unless $self->{w} != $w || $self->{h} != $h; 597 $self->_size_allocate ($x, $y, $w, $h) or return;
537 598
538 $self->SUPER::size_allocate ($w, $h); 599 $h -= List::Util::max 0, $self->{border} * 2;
600 $w -= List::Util::max 0, $self->{border} * 2;
539 601
540 $h -= $tex[1]->{h}; 602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
541 $h -= $tex[4]->{h}; 603}
542 $w -= $tex[2]->{w};
543 $w -= $tex[3]->{w};
544 604
545 $h = $h < 0 ? 0 : $h; 605sub button_down {
546 $w = $w < 0 ? 0 : $w; 606 my ($self, $ev, $x, $y) = @_;
547 607
548 my $child = $self->child; 608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
549 610
550 $child->size_allocate ($w, $h); 611 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
551 $child->move ($tex[3]->{w}, $tex[1]->{h}); 612 my ($bw, $bh) = ($self->{w}, $self->{h});
613
614 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_;
616
617 ($x, $y) = ($ev->motion_x, $ev->motion_y);
618
619 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy;
621 $self->update;
622 };
623
624 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
628 my ($bx, $by) = ($self->{x}, $self->{y});
629
630 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_;
632
633 ($x, $y) = ($ev->motion_x, $ev->motion_y);
634
635 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update;
637 };
638 }
639}
640
641sub button_up {
642 my ($self, $ev, $x, $y) = @_;
643
644 delete $self->{motion};
645}
646
647sub mouse_motion {
648 my ($self, $ev, $x, $y) = @_;
649
650 $self->{motion}->($ev, $x, $y) if $self->{motion};
552} 651}
553 652
554sub _draw { 653sub _draw {
555 my ($self) = @_; 654 my ($self) = @_;
556 655
557 my ($w, $h) = ($self->{w}, $self->{h}); 656 my ($w, $h ) = ($self->{w}, $self->{h});
558 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
559 658
560 glEnable GL_BLEND; 659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
561 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
562 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
564 663
565 my $top = $tex[1]; 664 glColor @{ $self->{border_bg} };
566 $top->draw_quad (0, 0, $w, $top->{h}); 665 $tex[1]->draw_quad (0, 0, $w, $self->{border});
567 666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
568 my $left = $tex[3]; 667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
569 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
570
571 my $right = $tex[2];
572 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
573
574 my $bottom = $tex[4];
575 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
576 669
577 my $bg = $tex[0]; 670 my $bg = $tex[0];
578 glBindTexture GL_TEXTURE_2D, $bg->{name};
579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
580 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
581 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
582 671
672 # TODO: repeat texture not scale
583 my $rep_x = $cw / $bg->{w}; 673 my $rep_x = $cw / $bg->{w};
584 my $rep_y = $ch / $bg->{h}; 674 my $rep_y = $ch / $bg->{h};
585 675
676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
586 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
587 682
683 glDisable GL_TEXTURE_2D;
588 glDisable GL_BLEND; 684 glDisable GL_BLEND;
589 glDisable GL_TEXTURE_2D;
590 685
591 $self->child->draw; 686 $self->child->draw;
592
593} 687}
594 688
595############################################################################# 689#############################################################################
596 690
597package CFClient::Widget::Table; 691package CFClient::UI::Table;
598 692
599our @ISA = CFClient::Widget::; 693our @ISA = CFClient::UI::Base::;
694
695use List::Util qw(max sum);
600 696
601use SDL::OpenGL; 697use SDL::OpenGL;
602 698
699sub new {
700 my $class = shift;
701
702 $class->SUPER::new (
703 col_expand => [],
704 @_
705 )
706}
707
603sub add { 708sub add {
604 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
605 my $old_chld = $self->{children}[$y][$x];
606 710
711 $child->set_parent ($self);
607 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
608 $chld->set_parent ($self); 713
714 $self->{w} = $self->{h} = -1;
609 $self->update; 715 $self->update;
610} 716}
611 717
612sub max_row_height { 718# TODO: move to container class maybe? send childs a signal on removal?
719sub clear {
613 my ($self, $row) = @_; 720 my ($self) = @_;
614 721
615 my $hs = 0; 722 delete $self->{children};
616 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 723 $self->update;
724}
725
726sub get_wh {
727 my ($self) = @_;
728
729 my (@w, @h);
730
731 for my $y (0 .. $#{$self->{children}}) {
617 my $c = $self->{children}->[$row]->[$xi]; 732 my $row = $self->{children}[$y]
618 if ($c) { 733 or next;
734
735 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x]
737 or next;
619 my ($w, $h) = $c->size_request; 738 my ($w, $h) = $widget->size_request;
620 if ($hs < $h) { $hs = $h } 739
740 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h;
621 } 742 }
622 } 743 }
623 return $hs;
624}
625 744
626sub max_col_width { 745 (\@w, \@h)
746}
747
748sub size_request {
627 my ($self, $col) = @_; 749 my ($self) = @_;
628 750
751 my ($ws, $hs) = $self->get_wh;
752
753 (
754 (sum @$ws),
755 (sum @$hs),
756 )
757}
758
759sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763
764 my ($ws, $hs) = $self->get_wh;
765
766 my $req_w = sum @$ws;
767 my $req_h = sum @$hs;
768
769 # TODO: nicer code && do row_expand
770 my @col_expand = @{$self->{col_expand}};
771 @col_expand = (1) x @$ws unless @col_expand;
772 my $col_expand = (sum @col_expand) || 1;
773
774 # linearly scale sizes
775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
780
781 my $y;
782
783 for my $r (0 .. $#{$self->{children}}) {
784 my $row = $self->{children}[$r]
785 or next;
786
629 my $ws = 0; 787 my $x = 0;
630 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 788 my $row_h = $hs->[$r];
631 my $c = ($self->{children}->[$yi] || [])->[$col]; 789
632 if ($c) { 790 for my $c (0 .. $#$row) {
633 my ($w, $h) = $c->size_request; 791 my $col_w = $ws->[$c];
634 if ($ws < $w) { $ws = $w } 792
793 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h);
795 }
796
797 $x += $col_w;
635 } 798 }
799
800 $y += $row_h;
636 } 801 }
637 return $ws; 802
638} 803}
804
805sub find_widget {
806 my ($self, $x, $y) = @_;
807
808 $x -= $self->{x};
809 $y -= $self->{y};
810
811 my $res;
812
813 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
814 $res = $_->find_widget ($x, $y)
815 and return $res;
816 }
817
818 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
819}
820
821sub _draw {
822 my ($self) = @_;
823
824 for (grep $_, @{$self->{children}}) {
825 $_->draw for grep $_, @$_;
826 }
827}
828
829#############################################################################
830
831package CFClient::UI::HBox;
832
833# TODO: wrap into common Box base class
834
835our @ISA = CFClient::UI::Container::;
639 836
640sub size_request { 837sub size_request {
641 my ($self) = @_; 838 my ($self) = @_;
642 839
840 my @alloc = map [$_->size_request], @{$self->{children}};
841
842 (
843 (List::Util::sum map $_->[0], @alloc),
844 (List::Util::max map $_->[1], @alloc),
845 )
846}
847
848sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852
643 my ($hs, $ws) = (0, 0); 853 ($h, $w) = ($w, $h);
644 854
645 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 855 my $children = $self->{children};
646 $hs += $self->max_row_height ($yi);
647 }
648 856
649 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 857 my @h = map +($_->size_request)[0], @$children;
650 my $wm = 0; 858
651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 859 my $req_h = List::Util::sum @h;
652 $wm += $self->max_col_width ($xi) 860
861 if ($req_h > $h) {
862 # ah well, not enough space
863 $_ *= $h / $req_h for @h;
864 } else {
865 my $exp = List::Util::sum map $_->{expand}, @$children;
866 $exp ||= 1;
867
868 for (0 .. $#$children) {
869 my $child = $children->[$_];
870
871 my $alloc_h = $h[$_];
872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
873 $h[$_] = $alloc_h;
653 } 874 }
654 if ($ws < $wm) { $ws = $wm }
655 } 875 }
656 876
657 return ($ws, $hs); 877 CFClient::UI::harmonize \@h;
658}
659
660sub _draw {
661 my ($self) = @_;
662 878
663 my $y = 0; 879 my $y = 0;
664 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 880 for (0 .. $#$children) {
881 my $child = $children->[$_];
665 my $x = 0; 882 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w);
666 884
667 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 885 $y += $h;
668
669 my $c = $self->{children}->[$yi]->[$xi];
670 if ($c) {
671 $c->move ($x, $y, 0); #TODO: Move to size_request
672 $c->draw if $c;
673 }
674
675 $x += $self->max_col_width ($xi);
676 }
677
678 $y += $self->max_row_height ($yi);
679 } 886 }
680} 887}
681 888
682############################################################################# 889#############################################################################
683 890
684package CFClient::Widget::VBox; 891package CFClient::UI::VBox;
685 892
893# TODO: wrap into common Box base class
894
686our @ISA = CFClient::Widget::Container::; 895our @ISA = CFClient::UI::Container::;
687
688use SDL::OpenGL;
689 896
690sub size_request { 897sub size_request {
691 my ($self) = @_; 898 my ($self) = @_;
692 899
693 my @alloc = map [$_->size_request], @{$self->{children}}; 900 my @alloc = map [$_->size_request], @{$self->{children}};
697 (List::Util::sum map $_->[1], @alloc), 904 (List::Util::sum map $_->[1], @alloc),
698 ) 905 )
699} 906}
700 907
701sub size_allocate { 908sub size_allocate {
702 my ($self, $w, $h) = @_; 909 my ($self, $x, $y, $w, $h) = @_;
703 910
704 return unless $self->{w} != $w || $self->{h} != $h; 911 $self->_size_allocate ($x, $y, $w, $h);
705
706 $self->{w} = $w;
707 $self->{h} = $h;
708
709 return unless $self->{h};
710 912
711 my $children = $self->{children}; 913 my $children = $self->{children};
712 914
713 my @h = map +($_->size_request)[1], @$children; 915 my @h = map +($_->size_request)[1], @$children;
714 916
715 my $req_h = List::Util::sum @h; 917 my $req_h = List::Util::sum @h;
716 918
717 if ($req_h > $h) { 919 if ($req_h > $h) {
718 # ah well, not enough space 920 # ah well, not enough space
719 $_ = $h[$_] * $h / $req_h for @h; 921 $_ *= $h / $req_h for @h;
720 } else { 922 } else {
721 my @exp = grep $_->{expand}, @$children; 923 my $exp = List::Util::sum map $_->{expand}, @$children;
722 @exp = @$children unless @exp; 924 $exp ||= 1;
723 925
724 my %exp = map +($_ => 1), @exp;
725
726 for (0 .. $#$children) { 926 for (0 .. $#$children) {
727 my $child = $children->[$_]; 927 my $child = $children->[$_];
728 928
729 my $alloc_h = $h[$_]; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
730 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
731 $h[$_] = $alloc_h;
732 } 930 }
733 } 931 }
932
933 CFClient::UI::harmonize \@h;
734 934
735 my $y = 0; 935 my $y = 0;
736 for (0 .. $#$children) { 936 for (0 .. $#$children) {
737 my $child = $children->[$_]; 937 my $child = $children->[$_];
738 my $h = $h[$_]; 938 my $h = $h[$_];
739 $child->move (0, $y);
740 $child->size_allocate ($w, $h); 939 $child->size_allocate (0, $y, $w, $h);
741 940
742 $y += $h; 941 $y += $h;
743 } 942 }
744} 943}
745 944
746############################################################################# 945#############################################################################
747 946
748package CFClient::Widget::Label; 947package CFClient::UI::Label;
749 948
750our @ISA = CFClient::Widget::; 949our @ISA = CFClient::UI::Base::;
751 950
752use SDL::OpenGL; 951use SDL::OpenGL;
753 952
754sub new { 953sub new {
755 my ($class, %arg) = @_; 954 my ($class, %arg) = @_;
756 955
757 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
758 fg => [1, 1, 1], 957 fg => [1, 1, 1],
759 height => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
760 text => "", 959 text => "",
761 align => -1, 960 align => -1,
961 valign => -1,
962 padding => 2,
762 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
763 %arg 964 %arg
764 ); 965 );
765 966
766 $self->set_text ($self->{text}); 967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
968
969 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
767 971
768 $self 972 $self
769} 973}
770 974
771sub escape_text { 975sub escape_text {
779} 983}
780 984
781sub set_text { 985sub set_text {
782 my ($self, $text) = @_; 986 my ($self, $text) = @_;
783 987
784 $self->{text} = $text;
785 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
786 989
787 delete $self->{texture}; 990 delete $self->{texture};
788 $self->update; 991 $self->update;
789} 992}
790 993
791sub get_text { 994sub set_markup {
792 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
793 996
794 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
795} 1001}
796 1002
797sub size_request { 1003sub size_request {
798 my ($self) = @_; 1004 my ($self) = @_;
799 1005
800 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
801 $self->{layout}->set_height ($self->{height}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
802 $self->{layout}->size 1009 my ($w, $h) = $self->{layout}->size;
803# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1010
804# ( 1011 (
805# $self->{texture}{w}, 1012 $w + $self->{padding} * 2,
806# $self->{texture}{h}, 1013 $h + $self->{padding} * 2,
807# ) 1014 )
808# } else {
809# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
810#
811# ($w, $h)
812# }
813} 1015}
814 1016
815sub size_allocate { 1017sub size_allocate {
816 my ($self, $w, $h) = @_; 1018 my ($self, $x, $y, $w, $h) = @_;
817 1019
818 return unless $self->{w} != $w || $self->{h} != $h; 1020 $self->_size_allocate ($x, $y, $w, $h) or return;
819 1021
820 $self->SUPER::size_allocate ($w, $h);
821 delete $self->{texture}; 1022 delete $self->{texture};
822} 1023}
823 1024
824sub update { 1025sub update {
825 my ($self) = @_; 1026 my ($self) = @_;
831sub _draw { 1032sub _draw {
832 my ($self) = @_; 1033 my ($self) = @_;
833 1034
834 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
835 $self->{layout}->set_width ($self->{w}); 1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
836 new_from_layout CFClient::Texture $self->{layout}; 1038 new_from_layout CFClient::Texture $self->{layout}
837 }; 1039 };
838 1040
839 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
843 1045
844 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
845 1047
846 my $x = 1048 $self->{ox} = int (
847 $self->{align} < 0 ? 0 1049 $self->{align} < 0 ? $self->{padding}
848 : $self->{align} > 0 ? $self->{w} - $self->{texture}{w} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
849 : ($self->{w} + $self->{texture}{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
850 1053
851 $tex->draw_quad ($x, 0); 1054 $self->{oy} = int (
1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
852 1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy});
1061
1062 glDisable GL_TEXTURE_2D;
853 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
854 glDisable GL_TEXTURE_2D;
855} 1064}
856 1065
857############################################################################# 1066#############################################################################
858 1067
859package CFClient::Widget::Entry; 1068package CFClient::UI::EntryBase;
860 1069
861our @ISA = CFClient::Widget::Label::; 1070our @ISA = CFClient::UI::Label::;
862 1071
863use SDL; 1072use SDL;
864use SDL::OpenGL; 1073use SDL::OpenGL;
865 1074
866sub new { 1075sub new {
867 my $class = shift; 1076 my $class = shift;
868 1077
869 $class->SUPER::new ( 1078 $class->SUPER::new (
870 fg => [1, 1, 1], 1079 fg => [1, 1, 1],
871 bg => [0, 0, 0, 0.4], 1080 bg => [0, 0, 0, 0.2],
872 active_bg => [1, 1, 1], 1081 active_bg => [1, 1, 1, 0.5],
873 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1083 can_hover => 1,
1084 can_focus => 1,
1085 valign => 0,
874 @_ 1086 @_
875 ) 1087 )
876} 1088}
877 1089
878sub _set_text { 1090sub _set_text {
879 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
880 1092
1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1096
881 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
882
883 $self->{text} = $text; 1098 $self->{text} = $text;
884 $self->{layout}->set_width ($self->{w});
885 1099
886 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
887 1102
1103 $self->emit (changed => $self->{text});
1104}
888 1105
889 $self->{layout}->set_markup ($self->escape_text ($text)); 1106sub get_text {
890 1107 $_[0]{text}
891 $text = substr $text, 0, $self->{cursor};
892 utf8::encode $text;
893
894 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
895} 1108}
896 1109
897sub size_request { 1110sub size_request {
898 my ($self) = @_; 1111 my ($self) = @_;
899 1112
901 1114
902 ($w + 1, $h) # add 1 for cursor 1115 ($w + 1, $h) # add 1 for cursor
903} 1116}
904 1117
905sub size_allocate { 1118sub size_allocate {
906 my ($self, $w, $h) = @_; 1119 my ($self, $x, $y, $w, $h) = @_;
907 1120
908 return unless $self->{w} != $w || $self->{h} != $h;
909
910 $self->SUPER::size_allocate ($w, $h); 1121 $self->SUPER::size_allocate ($x, $y, $w, $h);
911 1122
912 $self->_set_text ($self->{text}); 1123 $self->_set_text ($self->{text});
913} 1124}
914 1125
915sub set_text { 1126sub set_text {
936 substr $text, $self->{cursor}, 1, ""; 1147 substr $text, $self->{cursor}, 1, "";
937 } elsif ($sym == SDLK_LEFT) { 1148 } elsif ($sym == SDLK_LEFT) {
938 --$self->{cursor} if $self->{cursor}; 1149 --$self->{cursor} if $self->{cursor};
939 } elsif ($sym == SDLK_RIGHT) { 1150 } elsif ($sym == SDLK_RIGHT) {
940 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1152 } elsif ($sym == SDLK_HOME) {
1153 $self->{cursor} = 0;
1154 } elsif ($sym == SDLK_END) {
1155 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) {
1157 $self->emit ('escape');
941 } elsif ($uni) { 1158 } elsif ($uni) {
942 substr $text, $self->{cursor}++, 0, chr $uni; 1159 substr $text, $self->{cursor}++, 0, chr $uni;
943 } 1160 }
944 1161
945 $self->_set_text ($text); 1162 $self->_set_text ($text);
960 $self->SUPER::button_down ($ev, $x, $y); 1177 $self->SUPER::button_down ($ev, $x, $y);
961 1178
962 my $idx = $self->{layout}->xy_to_index ($x, $y); 1179 my $idx = $self->{layout}->xy_to_index ($x, $y);
963 1180
964 # byte-index to char-index 1181 # byte-index to char-index
965 my $text = $self->{layout}; 1182 my $text = $self->{text};
966 utf8::encode $text; 1183 utf8::encode $text;
967 $self->{cursor} = length substr $text, 0, $idx; 1184 $self->{cursor} = length substr $text, 0, $idx;
968 1185
969 $self->_set_text ($self->{text}); 1186 $self->_set_text ($self->{text});
970 $self->update; 1187 $self->update;
985 $self->{fg} = $self->{active_fg}; 1202 $self->{fg} = $self->{active_fg};
986 } else { 1203 } else {
987 glColor @{$self->{bg}}; 1204 glColor @{$self->{bg}};
988 } 1205 }
989 1206
1207 glEnable GL_BLEND;
1208 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glBegin GL_QUADS; 1209 glBegin GL_QUADS;
991 glVertex 0 , 0; 1210 glVertex 0 , 0;
992 glVertex 0 , $self->{h}; 1211 glVertex 0 , $self->{h};
993 glVertex $self->{w}, $self->{h}; 1212 glVertex $self->{w}, $self->{h};
994 glVertex $self->{w}, 0; 1213 glVertex $self->{w}, 0;
995 glEnd; 1214 glEnd;
1215 glDisable GL_BLEND;
996 1216
997 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
998 1218
999 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1000 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1220 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1221
1222 unless (exists $self->{cur_h}) {
1223 my $text = substr $self->{text}, 0, $self->{cursor};
1224 utf8::encode $text;
1225
1226 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1227 }
1228
1001 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1002 glBegin GL_LINES; 1230 glBegin GL_LINES;
1003 glVertex $self->{cur_x}, $self->{cur_y};
1004 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1231 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1232 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1005 glEnd; 1233 glEnd;
1006 } 1234 }
1007} 1235}
1008 1236
1009############################################################################# 1237package CFClient::UI::Entry;
1010 1238
1011package CFClient::Widget::Slider; 1239our @ISA = CFClient::UI::EntryBase::;
1012 1240
1013use strict; 1241use SDL;
1014
1015use SDL::OpenGL; 1242use SDL::OpenGL;
1016use SDL::OpenGL::Constants;
1017 1243
1018our @ISA = CFClient::Widget::DrawBG::; 1244sub key_down {
1019
1020sub size_request {
1021 my ($self) = @_; 1245 my ($self, $ev) = @_;
1022 1246
1023 my $w = 50; 1247 my $sym = $ev->key_sym;
1024 my $h = 10;
1025 1248
1026 $self->{vertical} ? ($h, $w) : ($w, $h) 1249 if ($sym == SDLK_RETURN) {
1250 $self->emit (activate => $self->get_text);
1251 $self->update;
1252
1253 } else {
1254 $self->SUPER::key_down ($ev);
1255 }
1256
1027} 1257}
1258
1259#############################################################################
1260
1261package CFClient::UI::Button;
1262
1263our @ISA = CFClient::UI::Label::;
1264
1265use SDL;
1266use SDL::OpenGL;
1267
1268my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1270 qw(b1_button_active.png);
1028 1271
1029sub new { 1272sub new {
1030 my $class = shift; 1273 my $class = shift;
1031 1274
1275 $class->SUPER::new (
1276 padding => 4,
1277 fg => [1, 1, 1],
1278 bg => [1, 1, 1, 0.2],
1279 active_fg => [1, 1, 0],
1280 can_hover => 1,
1281 @_
1282 )
1283}
1284
1285sub button_up {
1286 my ($self, $ev, $x, $y) = @_;
1287
1288 if ($x >= 0 && $x < $self->{w}
1289 && $y >= 0 && $y < $self->{h}) {
1290 $self->emit ("activate");
1291 }
1292}
1293
1294sub _draw {
1295 my ($self) = @_;
1296
1297 local $self->{fg} = $self->{fg};
1298
1299 if ($GRAB == $self) {
1300 $self->{fg} = $self->{active_fg};
1301 }
1302
1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D;
1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1308
1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1310
1311 glDisable GL_TEXTURE_2D;
1312 glDisable GL_BLEND;
1313
1314 $self->SUPER::_draw;
1315}
1316
1317#############################################################################
1318
1319package CFClient::UI::CheckBox;
1320
1321our @ISA = CFClient::UI::DrawBG::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326
1327use SDL;
1328use SDL::OpenGL;
1329
1330sub new {
1331 my $class = shift;
1332
1333 $class->SUPER::new (
1334 padding => 2,
1335 fg => [1, 1, 1],
1336 active_fg => [1, 1, 0],
1337 state => 0,
1338 can_hover => 1,
1339 @_
1340 )
1341}
1342
1343sub size_request {
1344 my ($self) = @_;
1345
1346 ($self->{padding} * 2 + 6) x 2
1347}
1348
1349sub size_allocate {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down {
1356 my ($self, $ev, $x, $y) = @_;
1357
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1360 $self->{state} = !$self->{state};
1361 $self->emit (changed => $self->{state});
1362 }
1363}
1364
1365sub _draw {
1366 my ($self) = @_;
1367
1368 $self->SUPER::_draw;
1369
1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1371
1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1373
1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1375
1376 glEnable GL_BLEND;
1377 glEnable GL_TEXTURE_2D;
1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1379
1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1381
1382 $tex->draw_quad (0, 0, $s, $s);
1383
1384 glDisable GL_TEXTURE_2D;
1385 glDisable GL_BLEND;
1386}
1387
1388#############################################################################
1389
1390package CFClient::UI::Slider;
1391
1392use strict;
1393
1394use SDL::OpenGL;
1395
1396our @ISA = CFClient::UI::DrawBG::;
1397
1398my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1400 qw(s1_slider.png s1_slider_bg.png);
1401
1402sub new {
1403 my $class = shift;
1404
1032 # range [value, low, high, page] 1405 # range [value, low, high, page]
1033 1406
1407 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off
1034 $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1035 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1036 active_fg => [0, 0, 0], 1412 active_fg => [0, 0, 0],
1037 range => [0, 0, 100, 10], 1413 range => [0, 0, 100, 10],
1414 req_w => 40,
1415 req_h => 13,
1038 vertical => 1, 1416 vertical => 0,
1417 can_hover => 1,
1418 inner_pad => 5,
1039 @_ 1419 @_
1040 ) 1420 );
1421
1422 $self
1423}
1424
1425sub size_request {
1426 my ($self) = @_;
1427
1428 my $w = $self->{req_w};
1429 my $h = $self->{req_h};
1430
1431 $self->{vertical} ? ($h, $w) : ($w, $h)
1041} 1432}
1042 1433
1043sub button_down { 1434sub button_down {
1044 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1045 1436
1053 if ($GRAB == $self) { 1444 if ($GRAB == $self) {
1054 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1445 my ($value, $lo, $hi, $page) = @{$self->{range}};
1055 1446
1056 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1057 1448
1449 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1450 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1451
1452 $x -= $inner_pad_px; # substract the padding
1058 $x = $x * ($hi - $lo) / $w + $lo; 1453 $x = $x * ($hi - $lo) / $inner_w + $lo;
1059 $x = $lo if $x < $lo; 1454 $x = $lo if $x < $lo;
1060 $x = $hi - $page if $x > $hi - $page; 1455 $x = $hi - $page if $x > $hi - $page;
1061 $self->{range}[0] = $x; 1456 $self->{range}[0] = $x;
1062 1457
1063 $self->emit (changed => $x); 1458 $self->emit (changed => $x);
1064 $self->update; 1459 $self->update;
1065 } 1460 }
1461}
1462
1463# the inner_* stuff is for generating a padding for the slider handle,
1464# so that the handle doesn't leave the texture. This calculation isn't 100%
1465# correct propably, but it does the job for now
1466sub _calc_inner_pad_px {
1467 my ($self, $w) = @_;
1468 ($w / 100) * $self->{inner_pad} # % to pixels
1066} 1469}
1067 1470
1068sub _draw { 1471sub _draw {
1069 my ($self) = @_; 1472 my ($self) = @_;
1070 1473
1084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1086 1489
1087 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1088 1491
1492 $hi = $value + 1 if $lo == $hi;
1493
1494 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1495 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1496
1089 $page = int $page * $w / ($hi - $lo); 1497 $page = int $page * $inner_w / ($hi - $lo);
1090 $value = int +($value - $lo) * $w / ($hi - $lo); 1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1091 1499
1092 $w -= $page; 1500 $w -= $page;
1093 $page &= ~1; 1501 $page &= ~1;
1094 glTranslate $page * 0.5, 0, 0; 1502 glTranslate $page * 0.5, 0, 0;
1503 $page ||= 2;
1095 1504
1096 glColor @$fg;
1097 glBegin GL_LINES;
1098 glVertex 0, 0; glVertex 0, $h;
1099 glVertex $w - 1, 0; glVertex $w - 1, $h;
1100 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1101 glEnd;
1102
1103 my $knob_a = $value - $page * 0.5; 1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1104 my $knob_b = $value + $page * 0.5; 1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1105 1507
1106 glBegin GL_QUADS; 1508 glEnable GL_BLEND;
1107 glColor @$fg; 1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1108 glVertex $knob_a, 0; 1510 glEnable GL_TEXTURE_2D;
1109 glVertex $knob_a, $h; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1110 glVertex $knob_b, $h;
1111 glVertex $knob_b, 0;
1112 1512
1113 if ($knob_a < $knob_b - 2) { 1513 # draw background
1114 glColor @$bg; 1514 $tex[1]->draw_quad (0, 0, $w, $h);
1115 glVertex $knob_a + 1, 1; 1515
1116 glVertex $knob_a + 1, $h - 1; 1516 # draw handle
1117 glVertex $knob_b - 1, $h - 1; 1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1118 glVertex $knob_b - 1, 1; 1518
1519 glDisable GL_BLEND;
1520 glDisable GL_TEXTURE_2D;
1521}
1522
1523#############################################################################
1524
1525package CFClient::UI::TextView;
1526
1527our @ISA = CFClient::UI::HBox::;
1528
1529use SDL::OpenGL;
1530
1531sub new {
1532 my $class = shift;
1533
1534 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6,
1536 req_h => $::HEIGHT / 6,
1537 fontsize => $::FONTSIZE,
1538 @_,
1539
1540 layout => (new CFClient::Layout),
1541 par => [],
1542 height => 0,
1543 children => [
1544 (new CFClient::UI::Empty expand => 1),
1545 (new CFClient::UI::Slider vertical => 1),
1546 ],
1547 );
1548
1549 $self->{children}[1]->connect (changed => sub {
1550 $self->update;
1551 });
1552
1553 $self
1554}
1555
1556sub set_fontsize {
1557 my ($self, $fontsize) = @_;
1558
1559 $self->{fontsize} = $fontsize;
1560 $self->reflow;
1561}
1562
1563sub text_height {
1564 my ($self, $text) = @_;
1565
1566 my $layout = $self->{layout};
1567
1568 $layout->set_height ($self->{fontsize});
1569 $layout->set_width ($self->{w});
1570 $layout->set_text ($text);
1119 } 1571
1120 glEnd; 1572 ($layout->size)[1]
1121} 1573}
1122 1574
1123############################################################################# 1575sub reflow {
1576 my ($self) = @_;
1124 1577
1578 $self->{need_reflow}++;
1579 $self->update;
1580}
1581
1582sub size_request {
1583 my ($self) = @_;
1584
1585 ($self->{req_w}, $self->{req_h})
1586}
1587
1588sub size_allocate {
1589 my ($self, $x, $y, $w, $h) = @_;
1590
1591 $self->SUPER::size_allocate ($x, $y, $w, $h);
1592
1593 $self->{layout}->set_height ($self->{fontsize});
1594 $self->{layout}->set_width ($self->{w});
1595
1596 $self->reflow;
1597}
1598
1599sub add_paragraph {
1600 my ($self, $color, $text) = @_;
1601
1602 #TODO: intelligently "reformat" paragraph
1603
1604 my $height = $self->text_height ($text);
1605
1606 $self->{height} += $height;
1607
1608 push @{$self->{par}}, [$height, $color, $text];
1609
1610 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1611 $self->{children}[1]->update;
1612}
1613
1614sub update {
1615 my ($self) = @_;
1616
1617 $self->SUPER::update;
1618
1619 return unless $self->{h} > 0;
1620
1621 delete $self->{texture};
1622
1623 $ROOT->on_refresh ($self, sub {
1624 if (delete $self->{need_reflow}) {
1625 my $height = 0;
1626
1627 $height += $_->[0] = $self->text_height ($_->[2])
1628 for @{$self->{par}};
1629
1630 $self->{height} = $height;
1631
1632 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1633
1634 delete $self->{texture};
1635 }
1636
1637 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1638 glClearColor 0, 0, 0, 1;
1639 glClear GL_COLOR_BUFFER_BIT;
1640
1641 glEnable GL_BLEND;
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645
1646 my $top = int $self->{children}[1]{range}[0];
1647
1648 my $y0 = $top;
1649 my $y1 = $top + $self->{h};
1650
1651 my $y = 0;
1652
1653 my $layout = $self->{layout};
1654
1655 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0];
1657
1658 if ($y0 < $y + $h && $y < $y1) {
1659 $layout->set_text ($par->[2]);
1660
1661 glColor @{ $par->[1] };
1662 my ($W, $H) = $layout->size;
1663 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1664 }
1665
1666 $y += $h;
1667 }
1668
1669 glDisable GL_TEXTURE_2D;
1670 glDisable GL_BLEND;
1671 };
1672 });
1673}
1674
1675sub _draw {
1676 my ($self) = @_;
1677
1678 if ($self->{texture}) {
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1682 glDisable GL_TEXTURE_2D;
1683 }
1684
1685 $self->{children}[1]->draw;
1686
1687}
1688
1689#############################################################################
1690
1125package CFClient::Widget::MapWidget; 1691package CFClient::UI::MapWidget;
1126 1692
1127use strict; 1693use strict;
1128 1694
1129use List::Util qw(min max); 1695use List::Util qw(min max);
1130 1696
1131use SDL; 1697use SDL;
1132use SDL::OpenGL; 1698use SDL::OpenGL;
1133use SDL::OpenGL::Constants;
1134 1699
1135our @ISA = CFClient::Widget::; 1700our @ISA = CFClient::UI::Base::;
1136 1701
1137sub new { 1702sub new {
1138 my $class = shift; 1703 my $class = shift;
1139 1704
1140 $class->SUPER::new ( 1705 $class->SUPER::new (
1141 z => -1, 1706 z => -1,
1707 can_focus => 1,
1142 list => (glGenLists 1), 1708 list => (glGenLists 1),
1143 @_ 1709 @_
1144 ) 1710 )
1145} 1711}
1146 1712
1147sub key_down { 1713sub key_down {
1149} 1715}
1150 1716
1151sub key_up { 1717sub key_up {
1152} 1718}
1153 1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1752}
1753
1154sub size_request { 1754sub size_request {
1155 ( 1755 (
1156 1 + int $::WIDTH / 32, 1756 1 + 32 * int $::WIDTH / 32,
1157 1 + int $::HEIGHT / 32, 1757 1 + 32 * int $::HEIGHT / 32,
1158 ) 1758 )
1159} 1759}
1160 1760
1161sub update { 1761sub update {
1162 my ($self) = @_; 1762 my ($self) = @_;
1163 1763
1164 $self->{need_update} = 1; 1764 $self->{need_update} = 1;
1765 $self->SUPER::update;
1165} 1766}
1166 1767
1167sub _draw { 1768sub draw {
1168 my ($self) = @_; 1769 my ($self) = @_;
1169 1770
1170 if (delete $self->{need_update}) { 1771 if (delete $self->{need_update}) {
1171 glNewList $self->{list}, GL_COMPILE; 1772 glNewList $self->{list}, GL_COMPILE;
1172 1773
1173 my $mx = $::CONN->{mapx}; 1774 if ($::MAP) {
1174 my $my = $::CONN->{mapy};
1175
1176 my $map = $::CONN->{map};
1177
1178 my ($xofs, $yofs);
1179
1180 my $sw = 1 + int $::WIDTH / 32; 1775 my $sw = int $::WIDTH / 32;
1181 my $sh = 1 + int $::HEIGHT / 32; 1776 my $sh = int $::HEIGHT / 32;
1182 1777
1183 if ($::CONN->{mapw} > $sw) { 1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1184 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1185 } else { 1780
1186 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785 if ($::CFG->{fow_enable}) {
1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788 glConvolutionFilter2D
1789 GL_CONVOLUTION_2D,
1790 GL_ALPHA,
1791 3, 3,
1792 GL_ALPHA, GL_FLOAT,
1793 pack "f*",
1794 0.1, 0.1, 0.1,
1795 0.1, 0.2, 0.1,
1796 0.1, 0.1, 0.1,
1797 ;
1798 glEnable GL_CONVOLUTION_2D;
1799 }
1800
1801 $self->{fow_texture} = new CFClient::Texture
1802 w => $w,
1803 h => $h,
1804 data => $data,
1805 internalformat => GL_ALPHA,
1806 format => GL_ALPHA;
1807
1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818 glDisable GL_TEXTURE_2D;
1819 glDisable GL_BLEND;
1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1187 } 1845 }
1188 1846
1189 if ($::CONN->{maph} > $sh) {
1190 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1191 } else {
1192 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1193 }
1194
1195 glEnable GL_TEXTURE_2D;
1196 glEnable GL_BLEND;
1197 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1198
1199 my $sw4 = ($sw + 3) & ~3;
1200 my $darkness = "\x00" x ($sw4 * $sh);
1201
1202 for my $x (0 .. $sw - 1) {
1203 my $row = $map->[$x + $xofs];
1204 for my $y (0 .. $sh - 1) {
1205
1206 my $cell = $row->[$y + $yofs]
1207 or next;
1208
1209 my $dark = $cell->[0];
1210 if ($dark < 0) {
1211 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1212 } else {
1213 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1214 }
1215
1216 for my $num (grep $_, @$cell[1,2,3]) {
1217 my $tex = $::CONN->{face}[$num]{texture} || next;
1218
1219 my ($w, $h) = @$tex{qw(w h)};
1220
1221 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1222 }
1223 }
1224 }
1225
1226# if (1) { # higher quality darkness
1227# $lighting =~ s/(.)/$1$1$1/gs;
1228# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1229#
1230# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1231#
1232# $lighting = $pb->get_pixels;
1233# $lighting =~ s/(.)../$1/gs;
1234# }
1235
1236 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1238
1239 $darkness = new CFClient::Texture
1240 width => $sw4,
1241 height => $sh,
1242 data => $darkness,
1243 internalformat => GL_ALPHA,
1244 format => GL_ALPHA;
1245
1246 glColor 0.45, 0.45, 0.45, 1;
1247 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1248
1249 glDisable GL_TEXTURE_2D;
1250 glDisable GL_BLEND;
1251
1252 glEndList; 1847 glEndList;
1253 } 1848 }
1254 1849
1850 glPushMatrix;
1255 glCallList $self->{list}; 1851 glCallList $self->{list};
1852 glPopMatrix;
1853
1854 if ($FOCUS != $self) {
1855 glColor 64/255, 64/255, 64/255;
1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1858 glBegin GL_QUADS;
1859 glVertex 0, 0;
1860 glVertex 0, $::HEIGHT;
1861 glVertex $::WIDTH, $::HEIGHT;
1862 glVertex $::WIDTH, 0;
1863 glEnd;
1864 glDisable GL_COLOR_LOGIC_OP;
1865 }
1256} 1866}
1257 1867
1258my %DIR = ( 1868my %DIR = (
1259 SDLK_KP8, [1, "north"], 1869 SDLK_KP8, [1, "north"],
1260 SDLK_KP9, [2, "northeast"], 1870 SDLK_KP9, [2, "northeast"],
1276 1886
1277 my $mod = $ev->key_mod; 1887 my $mod = $ev->key_mod;
1278 my $sym = $ev->key_sym; 1888 my $sym = $ev->key_sym;
1279 1889
1280 if ($sym == SDLK_KP5) { 1890 if ($sym == SDLK_KP5) {
1281 $::CONN->send ("command stay fire"); 1891 $::CONN->user_send ("stay fire");
1892 } elsif ($sym == SDLK_a) {
1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1282 } elsif (exists $DIR{$sym}) { 1898 } elsif (exists $DIR{$sym}) {
1283 if ($mod & KMOD_SHIFT) { 1899 if ($mod & KMOD_SHIFT) {
1284 $self->{shft}++; 1900 $self->{shft}++;
1285 $::CONN->send ("command fire $DIR{$sym}[0]"); 1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1286 } elsif ($mod & KMOD_CTRL) { 1902 } elsif ($mod & KMOD_CTRL) {
1287 $self->{ctrl}++; 1903 $self->{ctrl}++;
1288 $::CONN->send ("command run $DIR{$sym}[0]"); 1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1289 } else { 1905 } else {
1290 $::CONN->send ("command $DIR{$sym}[1]"); 1906 $::CONN->user_send ("$DIR{$sym}[1]");
1291 } 1907 }
1292 } 1908 }
1293} 1909}
1294 1910
1295sub key_up { 1911sub key_up {
1297 1913
1298 my $mod = $ev->key_mod; 1914 my $mod = $ev->key_mod;
1299 my $sym = $ev->key_sym; 1915 my $sym = $ev->key_sym;
1300 1916
1301 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1302 $::CONN->send ("command fire_stop"); 1918 $::CONN->user_send ("fire_stop");
1303 } 1919 }
1304 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1305 $::CONN->send ("command run_stop"); 1921 $::CONN->user_send ("run_stop");
1306 } 1922 }
1307} 1923}
1308 1924
1309############################################################################# 1925#############################################################################
1310 1926
1311package CFClient::Widget::Animator; 1927package CFClient::UI::Animator;
1312 1928
1313use SDL::OpenGL; 1929use SDL::OpenGL;
1314 1930
1315our @ISA = CFClient::Widget::Bin::; 1931our @ISA = CFClient::UI::Bin::;
1316 1932
1317sub moveto { 1933sub moveto {
1318 my ($self, $x, $y) = @_; 1934 my ($self, $x, $y) = @_;
1319 1935
1320 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1936 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
1348 glPopMatrix; 1964 glPopMatrix;
1349} 1965}
1350 1966
1351############################################################################# 1967#############################################################################
1352 1968
1353package CFClient::Widget::Toplevel; 1969package CFClient::UI::Flopper;
1354 1970
1971our @ISA = CFClient::UI::Button::;
1972
1973sub new {
1974 my $class = shift;
1975
1976 my $self = $class->SUPER::new (
1977 state => 0,
1978 connect_activate => \&toggle_flopper,
1979 @_
1980 );
1981
1982 if ($self->{state}) {
1983 $self->{state} = 0;
1984 $self->toggle_flopper;
1985 }
1986
1987 $self
1988}
1989
1990sub toggle_flopper {
1991 my ($self) = @_;
1992
1993 # TODO: use animation
1994 if ($self->{state} = !$self->{state}) {
1995 $CFClient::UI::ROOT->add ($self->{other});
1996 $self->{other}->move ($self->coord2global (0, $self->{h}));
1997 $self->emit ("open");
1998 } else {
1999 $CFClient::UI::ROOT->remove ($self->{other});
2000 $self->emit ("close");
2001 }
2002
2003 $self->emit (changed => $self->{state});
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::Root;
2009
1355our @ISA = CFClient::Widget::Container::; 2010our @ISA = CFClient::UI::Container::;
2011
2012use SDL::OpenGL;
1356 2013
1357sub size_request { 2014sub size_request {
1358 ($::WIDTH, $::HEIGHT) 2015 ($::WIDTH, $::HEIGHT)
1359} 2016}
1360 2017
1361sub size_allocate { 2018sub size_allocate {
1362 my ($self, $w, $h) = @_; 2019 my ($self, $x, $y, $w, $h) = @_;
1363 2020
1364 $self->SUPER::size_allocate ($w, $h); 2021 $self->_size_allocate ($x, $y, $w, $h);
1365 2022
1366 $_->size_allocate ($_->size_request) 2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1367 for @{$self->{children}}; 2024 for @{$self->{children}};
1368} 2025}
1369 2026
1370sub translate { 2027sub _topleft {
1371 my ($self, $x, $y) = @_; 2028 my ($self, $x, $y) = @_;
1372 2029
1373 ($x, $y) 2030 ($x, $y)
1374} 2031}
1375 2032
1376sub update { 2033sub update {
1377 my ($self) = @_; 2034 my ($self) = @_;
1378 2035
1379 $self->size_allocate ($self->size_request); 2036 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1380 ::refresh (); 2037 ::refresh ();
1381} 2038}
1382 2039
1383sub add { 2040sub add {
1384 my ($self, $widget) = @_; 2041 my ($self, $widget) = @_;
1385 2042
1386 $self->SUPER::add ($widget); 2043 $self->SUPER::add ($widget);
1387 2044
1388 $widget->size_allocate ($widget->size_request); 2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046}
2047
2048sub on_refresh {
2049 my ($self, $id, $cb) = @_;
2050
2051 $self->{refresh_hook}{$id} = $cb;
1389} 2052}
1390 2053
1391sub draw { 2054sub draw {
1392 my ($self) = @_; 2055 my ($self) = @_;
1393 2056
2057 while (my $rcb = delete $self->{refresh_hook}) {
2058 $_->() for values %$rcb;
2059 }
2060
2061 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2062 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2063 glClear GL_COLOR_BUFFER_BIT;
2064
2065 glMatrixMode GL_PROJECTION;
2066 glLoadIdentity;
2067 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2068 glMatrixMode GL_MODELVIEW;
2069 glLoadIdentity;
2070
1394 $self->_draw; 2071 $self->_draw;
1395} 2072}
1396 2073
1397############################################################################# 2074#############################################################################
1398 2075
1399package CFClient::Widget; 2076package CFClient::UI;
1400 2077
1401$TOPLEVEL = new CFClient::Widget::Toplevel; 2078$ROOT = new CFClient::UI::Root;
1402 2079
14031 20801
1404 2081

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines