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

Diff Legend

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