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.53 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC

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

Diff Legend

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