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.36 by elmex, Sun Apr 9 17:39:56 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 00:40:45 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 ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10our $FOCUS; # the widget with current focus
11
12# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 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
22} 100}
23 101
24sub move { 102sub move {
25 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 104 $self->{x} = $x;
… …
35sub size_request { 113sub size_request {
36 require Carp; 114 require Carp;
37 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
38} 116}
39 117
118sub _size_allocate {
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;
125
126 $self->{w} = $w;
127 $self->{h} = $h;
128
129 1
130}
131
40sub size_allocate { 132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global koordinates to local coordinate system
139sub translate {
41 my ($self, $w, $h) = @_; 140 my ($self, $x, $y) = @_;
42 $self->w ($w); 141
43 $self->h ($h); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 143}
45 144
46sub focus_in { 145sub focus_in {
47 my ($widget) = @_; 146 my ($self) = @_;
48 $FOCUS = $widget; 147
148 return if $FOCUS == $self;
149
150 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus;
152 $FOCUS->update;
49} 153}
50 154
51sub focus_out { 155sub focus_out {
52 my ($widget) = @_; 156 my ($self) = @_;
53}
54 157
158 return unless $FOCUS == $self;
159
160 my $focus = $FOCUS; undef $FOCUS;
161 $focus->update if $focus; #?
162}
163
164sub mouse_motion { }
165sub button_up { }
55sub key_down { 166sub key_down { }
56 my ($widget, $sdlev) = @_;
57}
58
59sub key_up { 167sub key_up { }
60 my ($widget, $sdlev) = @_;
61}
62 168
63sub button_down { 169sub button_down {
64 my ($widget, $sdlev) = @_; 170 my ($self, $ev, $x, $y) = @_;
65}
66 171
67sub button_up { 172 $self->focus_in;
68 my ($widget, $sdlev) = @_;
69} 173}
70 174
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 180
77sub draw { 181sub draw {
78 my ($self) = @_; 182 my ($self) = @_;
183
184 return unless $self->{h} && $self->{w};
79 185
80 glPushMatrix; 186 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 188 $self->_draw;
83 glPopMatrix; 189 glPopMatrix;
190
191 if ($self == $HOVER) {
192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS;
198 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y;
200 glVertex $x + $self->{w}, $y + $self->{h};
201 glVertex $x , $y + $self->{h};
202 glEnd;
203 glDisable GL_BLEND;
204 }
84} 205}
85 206
86sub _draw { 207sub _draw {
87 my ($widget) = @_; 208 my ($self) = @_;
88}
89 209
90sub bbox { 210 warn "no draw defined for $self\n";
211}
212
213sub find_widget {
91 my ($self) = @_; 214 my ($self, $x, $y) = @_;
92 my ($w, $h) = $self->size_request; 215
216 return $self
217 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
219
93 ( 220 ()
94 $self->{x},
95 $self->{y},
96 $self->{x} = $w,
97 $self->{y} = $h
98 )
99} 221}
100
101sub del_parent { $_[0]->{parent} = undef }
102 222
103sub set_parent { 223sub set_parent {
104 my ($self, $par) = @_; 224 my ($self, $par) = @_;
105 225
106 $self->{parent} = $par; 226 $self->{parent} = $par;
… …
116 236
117 $self->{parent}->update 237 $self->{parent}->update
118 if $self->{parent}; 238 if $self->{parent};
119} 239}
120 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
121sub DESTROY { 254sub DESTROY {
122 my ($self) = @_; 255 my ($self) = @_;
123 256
124 #$self->deactivate; 257 #$self->deactivate;
125} 258}
126 259
127package Crossfire::Client::Widget::Bin; 260#############################################################################
128 261
129our @ISA = Crossfire::Client::Widget::; 262package CFClient::UI::DrawBG;
130 263
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 264our @ISA = CFClient::UI::Base::;
132sub get { $_[0]->{child} }
133 265
134sub remove { 266use strict;
267use SDL::OpenGL;
268
269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
135 my ($self, $chld) = @_; 282 my ($self) = @_;
136 delete $self->{child} 283
137 if $self->{child} == $chld; 284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
138} 298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
139 305
140sub size_request { 306sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 307 (0, 0)
142} 308}
143sub size_allocate {
144 my ($self, $w, $h) = @_;
145 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h)
147 if $self->{child}
148}
149 309
150sub _draw { 310sub draw { }
151 my ($self) = @_;
152 311
153 $self->{child}->draw; 312#############################################################################
154}
155 313
156package Crossfire::Client::Widget::Toplevel; 314package CFClient::UI::Container;
157 315
158our @ISA = Crossfire::Client::Widget::; 316our @ISA = CFClient::UI::Base::;
159 317
160use SDL::OpenGL; 318sub new {
319 my ($class, %arg) = @_;
320
321 my $children = delete $arg{children} || [];
322
323 my $self = $class->SUPER::new (children => [], %arg);
324 $self->add ($_) for @$children;
325
326 $self
327}
161 328
162sub add { 329sub add {
163 my ($self, $chld) = @_; 330 my ($self, $chld) = @_;
164 331
165 push @{$self->{childs}}, $chld; 332 $chld->set_parent ($self);
333
166 @{$self->{childs}} = 334 $self->{children} = [
167 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}}; 336 @{$self->{children}}, $chld
337 ];
169 338
170 $chld->set_parent ($self); 339 $self->{w} = $self->{h} = -1;
171 $chld->size_allocate ($chld->size_request); 340 $self->update;
172} 341}
173 342
174sub remove { 343sub remove {
175 my ($self, $chld) = @_; 344 my ($self, $widget) = @_;
345
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
347
348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
349}
350
351sub find_widget {
352 my ($self, $x, $y) = @_;
353
354 $x -= $self->{x};
355 $y -= $self->{y};
356
357 my $res;
358
359 for (reverse @{ $self->{children} }) {
360 $res = $_->find_widget ($x, $y)
361 and return $res;
362 }
363
364 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
365}
366
367sub _draw {
368 my ($self) = @_;
369
370 $_->draw for @{$self->{children}};
371}
372
373#############################################################################
374
375package CFClient::UI::Bin;
376
377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
176 @{$self->{childs}} = 390 $self->{children} = [];
177 sort { $a->{z} <=> $b->{z} } 391
178 grep { $_ && $_ != $_[0] } 392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
179 @{$self->{childs}} 401 unless @{$self->{children}};
402}
403
404sub child { $_[0]->{children}[0] }
405
406sub size_request {
407 $_[0]{children}[0]->size_request
408}
409
410sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_;
412
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
416}
417
418#############################################################################
419
420package CFClient::UI::Window;
421
422our @ISA = CFClient::UI::Bin::;
423
424use SDL::OpenGL;
425
426sub new {
427 my ($class, %arg) = @_;
428
429 my $self = $class->SUPER::new (%arg);
180} 430}
181 431
182sub update { 432sub update {
183 my ($self) = @_; 433 my ($self) = @_;
184 ::refresh ();
185}
186 434
187sub _draw { 435 # we want to do this delayed...
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
202 $self->SUPER::add ($chld);
203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 436 $self->render_chld;
437 $self->SUPER::update;
215} 438}
216 439
217sub render_chld { 440sub render_chld {
218 my ($self) = @_; 441 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 442
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
225 $self->{texture} = 443 $self->{texture} =
226 Crossfire::Client::Texture->new_from_opengl ( 444 CFClient::Texture->new_from_opengl (
227 $w, $h, sub { $chld->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
228 ); 446 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 447}
236 448
237sub size_allocate { 449sub size_allocate {
238 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
239 451
240 $self->w ($w); 452 $self->_size_allocate ($x, $y, $w, $h) or return;
241 $self->h ($h); 453
242 $self->get->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
243 455
244 $self->update; #TODO: Move this to the size_request event propably? 456 $self->render_chld;
245} 457}
246 458
247sub _draw { 459sub _draw {
248 my ($self) = @_; 460 my ($self) = @_;
249 461
… …
251 463
252 my $tex = $self->{texture} 464 my $tex = $self->{texture}
253 or return; 465 or return;
254 466
255 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
256 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 471
260 glBegin GL_QUADS; 472 $tex->draw_quad (0, 0, $w, $h);
261 glTexCoord 0, 0; glVertex 0, 0;
262 glTexCoord 0, 1; glVertex 0, $h;
263 glTexCoord 1, 1; glVertex $w, $h;
264 glTexCoord 1, 0; glVertex $w, 0;
265 glEnd;
266 473
267 glDisable GL_BLEND; 474 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
269} 476}
270 477
271package Crossfire::Client::Widget::Frame; 478#############################################################################
272 479
273our @ISA = Crossfire::Client::Widget::Bin::; 480package CFClient::UI::Frame;
481
482our @ISA = CFClient::UI::Bin::;
274 483
275use SDL::OpenGL; 484use SDL::OpenGL;
276 485
277sub size_request { 486sub size_request {
278 my ($self) = @_; 487 my ($self) = @_;
279 my $chld = $self->get 488 my $chld = $self->child
280 or return (0, 0); 489 or return (0, 0);
281 490
282 $chld->move (2, 2); 491 $chld->move (2, 2);
283 492
284 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
285} 494}
286 495
287sub size_allocate { 496sub size_allocate {
288 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
498
499 $self->_size_allocate ($x, $y, $w, $h) or return;
289 500
290 $self->w ($w);
291 $self->h ($h);
292
293 $self->get->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
294 $self->get->move (2, 2);
295} 502}
296 503
297sub _draw { 504sub _draw {
298 my ($self) = @_; 505 my ($self) = @_;
299 506
300 my $chld = $self->get; 507 my $chld = $self->child;
301 508
302 my ($w, $h) = $chld->size_request; 509 my ($w, $h) = $chld->size_request;
303 510
304 glBegin GL_QUADS; 511 glBegin GL_QUADS;
305 glColor 0, 0, 0; 512 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 513 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 514 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 515 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 516 glVertex $w + 4 , 0;
310 glEnd; 517 glEnd;
311 518
312 $chld->draw; 519 $chld->draw;
313} 520}
314 521
522#############################################################################
523
315package Crossfire::Client::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
316 525
317our @ISA = Crossfire::Client::Widget::Frame::; 526our @ISA = CFClient::UI::Bin::;
318 527
319use SDL::OpenGL; 528use SDL::OpenGL;
320 529
321sub new { 530my @tex =
322 my ($self, $theme) = @_;
323 $self = $self->SUPER::new;
324
325 $self->{txts} = [
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
328 ];
329 $self
330}
331 533
332sub size_request { 534sub size_request {
333 my ($self) = @_; 535 my ($self) = @_;
536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
334 my ($w, $h) = $self->get->size_request; 539 my ($w, $h) = $self->SUPER::size_request;
335 540
336 $h += $self->{txts}->[1]->{height}; 541 $h += $tex[1]->{h};
337 $h += $self->{txts}->[4]->{height}; 542 $h += $tex[4]->{h};
338 $w += $self->{txts}->[2]->{width}; 543 $w += $tex[2]->{w};
339 $w += $self->{txts}->[3]->{width}; 544 $w += $tex[3]->{w};
340 545
341 ($w, $h) 546 ($w, $h)
342} 547}
343 548
344sub size_allocate { 549sub size_allocate {
345 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
346 551
347 $self->w ($w); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
348 $self->h ($h); 553
349 $h -= $self->{txts}->[1]->{height}; 554 $h -= $tex[1]{h};
350 $h -= $self->{txts}->[4]->{height}; 555 $h -= $tex[4]{h};
351 $w -= $self->{txts}->[2]->{width}; 556 $w -= $tex[2]{w};
352 $w -= $self->{txts}->[3]->{width}; 557 $w -= $tex[3]{w};
353 558
354 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n"; 561
357 $self->get->size_allocate ($w, $h); 562 my $child = $self->child;
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
359} 613}
360 614
361sub _draw { 615sub _draw {
362 my ($self) = @_; 616 my ($self) = @_;
363 617
364 my ($w, $h) = ($self->w, $self->h); 618 my ($w, $h) = ($self->{w}, $self->{h});
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
366 620
367 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
368 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 625
372 my $top = $self->{txts}->[1]; 626 my $top = $tex[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name}; 627 $top->draw_quad (0, 0, $w, $top->{h});
374 628
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3]; 629 my $left = $tex[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name}; 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
384 631
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2]; 632 my $right = $tex[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name}; 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
394 634
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4]; 635 my $bottom = $tex[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
404 637
405 glBegin GL_QUADS; 638 my $bg = $tex[0];
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411 639
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417 644
418 my $rep_x = $cw / $bg->{width}; 645 my $rep_x = $cw / $bg->{w};
419 my $rep_y = $ch / $bg->{height}; 646 my $rep_y = $ch / $bg->{h};
420 647
421 glBegin GL_QUADS; 648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427 649
650 glDisable GL_TEXTURE_2D;
428 glDisable GL_BLEND; 651 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D;
430 652
431 $self->get->draw; 653 $self->child->draw;
432 654
433} 655}
434 656
435package Crossfire::Client::Widget::Table; 657#############################################################################
436 658
437our @ISA = Crossfire::Client::Widget::Bin::; 659package CFClient::UI::Table;
660
661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
438 664
439use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
440 675
441sub add { 676sub add {
442 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x];
444 678
445 $self->{childs}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
446 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
447 $self->update; 683 $self->update;
448} 684}
449 685
450sub max_row_height { 686sub get_wh {
451 my ($self, $row) = @_; 687 my ($self) = @_;
452 688
453 my $hs = 0; 689 my (@w, @h);
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 690
455 my $c = $self->{childs}->[$row]->[$xi]; 691 for my $y (0 .. $#{$self->{children}}) {
456 if ($c) { 692 my $row = $self->{children}[$y]
693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
457 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
458 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
459 } 702 }
460 } 703 }
461 return $hs;
462}
463 704
464sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
465 my ($self, $col) = @_; 709 my ($self) = @_;
466 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 my $y;
739
740 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r]
742 or next;
743
467 my $ws = 0; 744 my $x = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 745 my $row_h = $hs->[$r];
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 746
470 if ($c) { 747 for my $c (0 .. $#$row) {
471 my ($w, $h) = $c->size_request; 748 my $widget = $row->[$c]
472 if ($ws < $w) { $ws = $w } 749 or next;
750
751 my $col_w = $ws->[$c];
752
753 $widget->size_allocate ($x, $y, $col_w, $row_h);
754
755 $x += $col_w;
473 } 756 }
757
758 $y += $row_h;
474 } 759 }
475 return $ws; 760
476} 761}
762
763sub find_widget {
764 my ($self, $x, $y) = @_;
765
766 $x -= $self->{x};
767 $y -= $self->{y};
768
769 my $res;
770
771 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
772 $res = $_->find_widget ($x, $y)
773 and return $res;
774 }
775
776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
777}
778
779sub _draw {
780 my ($self) = @_;
781
782 for (grep $_, @{$self->{children}}) {
783 $_->draw for grep $_, @$_;
784 }
785}
786
787#############################################################################
788
789package CFClient::UI::HBox;
790
791# TODO: wrap into common Box base class
792
793our @ISA = CFClient::UI::Container::;
477 794
478sub size_request { 795sub size_request {
479 my ($self) = @_; 796 my ($self) = @_;
480 797
798 my @alloc = map [$_->size_request], @{$self->{children}};
799
800 (
801 (List::Util::sum map $_->[0], @alloc),
802 (List::Util::max map $_->[1], @alloc),
803 )
804}
805
806sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_;
808
809 $self->_size_allocate ($x, $y, $w, $h) or return;
810
811 return unless $self->{w};
812
481 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
482 814
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 815 my $children = $self->{children};
484 $hs += $self->max_row_height ($yi);
485 }
486 816
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
488 my $wm = 0; 818
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
490 $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;
491 } 834 }
492 if ($ws < $wm) { $ws = $wm }
493 } 835 }
494
495 return ($ws, $hs);
496}
497
498sub _draw {
499 my ($self) = @_;
500 836
501 my $y = 0; 837 my $y = 0;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 838 for (0 .. $#$children) {
839 my $child = $children->[$_];
503 my $x = 0; 840 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
504 842
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 843 $y += $h;
844 }
845}
506 846
507 my $c = $self->{childs}->[$yi]->[$xi]; 847#############################################################################
508 if ($c) { 848
509 $c->move ($x, $y, 0); #TODO: Move to size_request 849package CFClient::UI::VBox;
510 $c->draw if $c; 850
851# TODO: wrap into common Box base class
852
853our @ISA = CFClient::UI::Container::;
854
855sub size_request {
856 my ($self) = @_;
857
858 my @alloc = map [$_->size_request], @{$self->{children}};
859
860 (
861 (List::Util::max map $_->[0], @alloc),
862 (List::Util::sum map $_->[1], @alloc),
863 )
864}
865
866sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h) or return;
870
871 return unless $self->{h};
872
873 my $children = $self->{children};
874
875 my @h = map +($_->size_request)[1], @$children;
876
877 my $req_h = List::Util::sum @h;
878
879 if ($req_h > $h) {
880 # ah well, not enough space
881 $_ *= $h / $req_h for @h;
882 } else {
883 my $exp = List::Util::sum map $_->{expand}, @$children;
884 $exp ||= 1;
511 } 885
886 for (0 .. $#$children) {
887 my $child = $children->[$_];
512 888
513 $x += $self->max_col_width ($xi); 889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
514 } 890 }
515
516 $y += $self->max_row_height ($yi);
517 } 891 }
518}
519 892
520package Crossfire::Client::Widget::VBox; 893 my $y = 0;
894 for (0 .. $#$children) {
895 my $child = $children->[$_];
896 my $h = $h[$_];
897 $child->size_allocate (0, $y, $w, $h);
521 898
522our @ISA = Crossfire::Client::Widget::Bin::; 899 $y += $h;
900 }
901}
902
903#############################################################################
904
905package CFClient::UI::Label;
906
907our @ISA = CFClient::UI::Base::;
523 908
524use SDL::OpenGL; 909use SDL::OpenGL;
525 910
526sub add {
527 my ($self, $chld, $expand) = @_;
528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update;
532}
533
534sub size_request {
535 my ($self) = @_;
536
537 my ($hs, $ws) = (0, 0);
538 for (@{$self->{childs} || []}) {
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 }
543
544 return ($ws, $hs);
545}
546
547sub size_allocate {
548 my ($self, $w, $h) = @_;
549
550 $self->w ($w);
551 $self->h ($h);
552
553 my $exp;
554 my @oth;
555 # find expand widget
556 for (@{$self->{childs}}) {
557 if ($_->{expand}) {
558 $exp = $_;
559 last;
560 }
561 push @oth, $_;
562 }
563
564 my ($ow, $oh);
565
566 # get sizes of other widgets
567 for (@oth) {
568 my ($w, $h) = $_->size_request;
569 $oh += $h;
570 if ($ow < $w) { $ow = $w }
571 }
572
573 my $y = 0;
574 for (@{$self->{childs}}) {
575 $_->move (0, $y);
576
577 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh;
580 } else {
581 my ($cw, $h) = $_->size_request;
582 $_->size_allocate ($w, $h);
583 $y += $h;
584 }
585 }
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597
598package Crossfire::Client::Widget::Label;
599
600our @ISA = Crossfire::Client::Widget::;
601
602use SDL::OpenGL;
603
604sub new { 911sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_; 912 my ($class, %arg) = @_;
606 913
607 # TODO: color, and make height, xyz etc. optional 914 my $self = $class->SUPER::new (
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 915 fg => [1, 1, 1],
916 height => $::FONTSIZE,
917 text => "",
918 align => -1,
919 padding => 2,
920 layout => new CFClient::Layout,
921 %arg
922 );
609 923
610 $self->set_text ($text); 924 $self->set_text ($self->{text});
611 925
612 $self 926 $self
927}
928
929sub escape_text {
930 local $_ = $_[1];
931
932 s/&/&amp;/g;
933 s/>/&gt;/g;
934 s/</&lt;/g;
935
936 $_[1]
613} 937}
614 938
615sub set_text { 939sub set_text {
616 my ($self, $text) = @_; 940 my ($self, $text) = @_;
617 941
618 $self->{text} = $text; 942 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 943 $self->{layout}->set_markup ($text);
620 944
945 delete $self->{texture};
946# $self->{w} = $self->{h} = -1;
621 $self->update; 947 $self->update;
622} 948}
623 949
624sub get_text { 950sub get_text {
625 my ($self, $text) = @_; 951 my ($self, $text) = @_;
… …
628} 954}
629 955
630sub size_request { 956sub size_request {
631 my ($self) = @_; 957 my ($self) = @_;
632 958
959 $self->{layout}->set_width;
960 $self->{layout}->set_height ($self->{height});
961 my ($w, $h) = $self->{layout}->size;
962
633 ( 963 (
634 $self->{texture}{width}, 964 $w + $self->{padding} * 2,
635 $self->{texture}{height}, 965 $h + $self->{padding} * 2,
636 ) 966 )
637} 967}
638 968
969sub size_allocate {
970 my ($self, $x, $y, $w, $h) = @_;
971
972 $self->_size_allocate ($x, $y, $w, $h) or return;
973
974 delete $self->{texture};
975}
976
977sub update {
978 my ($self) = @_;
979
980 delete $self->{texture};
981 $self->SUPER::update;
982}
983
639sub _draw { 984sub _draw {
640 my ($self) = @_; 985 my ($self) = @_;
641 986
642 my $tex = $self->{texture}; 987 my $tex = $self->{texture} ||= do {
988 $self->{layout}->set_width ($self->{w});
989 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
990 new_from_layout CFClient::Texture $self->{layout}
991 };
643 992
644 glEnable GL_BLEND; 993 glEnable GL_BLEND;
994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
645 glEnable GL_TEXTURE_2D; 995 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 997
650 glColor 1, 0, 0, 1; # TODO color 998 glColor @{$self->{fg}};
651 999
652 glBegin GL_QUADS; 1000 my $x =
653 glTexCoord 0, 0; glVertex 0 , 0; 1001 $self->{align} < 0 ? $self->{padding}
654 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1002 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1003 : ($self->{w} - $tex->{w}) * 0.5;
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658 1004
1005 $tex->draw_quad ($x, $self->{padding});
1006
1007 glDisable GL_TEXTURE_2D;
659 glDisable GL_BLEND; 1008 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D;
661} 1009}
662 1010
663package Crossfire::Client::Widget::TextEntry; 1011#############################################################################
664 1012
1013package CFClient::UI::Entry;
1014
665our @ISA = Crossfire::Client::Widget::Label::; 1015our @ISA = CFClient::UI::Label::;
666 1016
667use SDL; 1017use SDL;
668use SDL::OpenGL; 1018use SDL::OpenGL;
669 1019
1020sub new {
1021 my $class = shift;
1022
1023 $class->SUPER::new (
1024 fg => [1, 1, 1],
1025 bg => [0, 0, 0, 0.2],
1026 active_bg => [1, 1, 1, 0.5],
1027 active_fg => [0, 0, 0],
1028 @_
1029 )
1030}
1031
1032sub _set_text {
1033 my ($self, $text) = @_;
1034
1035 $self->{last_activity} = $::NOW;
1036
1037 $self->{text} = $text;
1038 $self->{layout}->set_width ($self->{w});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048}
1049
1050sub size_request {
1051 my ($self) = @_;
1052
1053 my ($w, $h) = $self->SUPER::size_request;
1054
1055 ($w + 1, $h) # add 1 for cursor
1056}
1057
1058sub size_allocate {
1059 my ($self, $x, $y, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($x, $y, $w, $h);
1062
1063 $self->_set_text ($self->{text});
1064}
1065
1066sub set_text {
1067 my ($self, $text) = @_;
1068
1069 $self->{cursor} = length $text;
1070 $self->_set_text ($text);
1071 $self->update;
1072}
1073
670sub key_down { 1074sub key_down {
671 my ($self, $ev) = @_; 1075 my ($self, $ev) = @_;
672 1076
673 my $mod = $ev->key_mod; 1077 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym; 1078 my $sym = $ev->key_sym;
675 1079
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode; 1080 my $uni = $ev->key_unicode;
678 1081
679 my $text = $self->get_text; 1082 my $text = $self->get_text;
680 1083
681 if ($sym == SDLK_BACKSPACE) { 1084 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, ''; 1085 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
683 1086 } elsif ($sym == SDLK_DELETE) {
1087 substr $text, $self->{cursor}, 1, "";
1088 } elsif ($sym == SDLK_LEFT) {
1089 --$self->{cursor} if $self->{cursor};
1090 } elsif ($sym == SDLK_RIGHT) {
1091 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1092 } elsif ($sym == SDLK_HOME) {
1093 $self->{cursor} = 0;
1094 } elsif ($sym == SDLK_END) {
1095 $self->{cursor} = length $text;
684 } elsif ($uni) { 1096 } elsif ($uni) {
685 $text .= chr $uni; 1097 substr $text, $self->{cursor}++, 0, chr $uni;
686 } 1098 }
1099
687 $self->set_text ($text); 1100 $self->_set_text ($text);
1101 $self->update;
688} 1102}
689 1103
690package Crossfire::Client::Widget::MapWidget; 1104sub focus_in {
1105 my ($self) = @_;
691 1106
692use strict; 1107 $self->{last_activity} = $::NOW;
693 1108
694use List::Util qw(min max); 1109 $self->SUPER::focus_in;
1110}
1111
1112sub button_down {
1113 my ($self, $ev, $x, $y) = @_;
1114
1115 $self->SUPER::button_down ($ev, $x, $y);
1116
1117 my $idx = $self->{layout}->xy_to_index ($x, $y);
1118
1119 # byte-index to char-index
1120 my $text = $self->{text};
1121 utf8::encode $text;
1122 $self->{cursor} = length substr $text, 0, $idx;
1123
1124 $self->_set_text ($self->{text});
1125 $self->update;
1126}
1127
1128sub mouse_motion {
1129 my ($self, $ev, $x, $y) = @_;
1130# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1131}
1132
1133sub _draw {
1134 my ($self) = @_;
1135
1136 local $self->{fg} = $self->{fg};
1137
1138 if ($FOCUS == $self) {
1139 glColor @{$self->{active_bg}};
1140 $self->{fg} = $self->{active_fg};
1141 } else {
1142 glColor @{$self->{bg}};
1143 }
1144
1145 glEnable GL_BLEND;
1146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1147 glBegin GL_QUADS;
1148 glVertex 0 , 0;
1149 glVertex 0 , $self->{h};
1150 glVertex $self->{w}, $self->{h};
1151 glVertex $self->{w}, 0;
1152 glEnd;
1153 glDisable GL_BLEND;
1154
1155 $self->SUPER::_draw;
1156
1157 #TODO: force update every cursor change :(
1158 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1159 glColor @{$self->{fg}};
1160 glBegin GL_LINES;
1161 glVertex $self->{cur_x}, $self->{cur_y};
1162 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1163 glEnd;
1164 }
1165}
1166
1167#############################################################################
1168
1169package CFClient::UI::Button;
1170
1171our @ISA = CFClient::UI::Label::;
695 1172
696use SDL; 1173use SDL;
697use SDL::OpenGL; 1174use SDL::OpenGL;
698use SDL::OpenGL::Constants;
699 1175
700our @ISA = Crossfire::Client::Widget::; 1176sub new {
1177 my $class = shift;
1178
1179 $class->SUPER::new (
1180 padding => 4,
1181 fg => [1, 1, 1],
1182 bg => [1, 1, 1, 0.2],
1183 active_bg => [0, 0, 0, 0.5],
1184 active_fg => [1, 1, 0],
1185 border_fg => [1, 1, 0],
1186 @_
1187 )
1188}
1189
1190sub button_up {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($x >= 0 && $x < $self->{w}
1194 && $y >= 0 && $y < $self->{h}) {
1195 $self->emit ("activate");
1196 }
1197}
1198
1199sub _draw {
1200 my ($self) = @_;
1201
1202 local $self->{fg} = $self->{fg};
1203
1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206
1207 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1208
1209 glBegin GL_LINE_LOOP;
1210 glColor @{$self->{border_fg}};
1211 glVertex 1 , 1;
1212 glVertex 1 , $self->{h} - 2;
1213 glVertex $self->{w} - 2, $self->{h} - 2;
1214 glVertex $self->{w} - 2, 1;
1215 glEnd;
1216
1217 if ($GRAB == $self) {
1218 glColor @{$self->{active_bg}};
1219 $self->{fg} = $self->{active_fg};
1220 } else {
1221 glColor @{$self->{bg}};
1222 }
1223
1224 glBegin GL_QUADS;
1225 glVertex 2 , 2;
1226 glVertex 2 , $self->{h} - 2;
1227 glVertex $self->{w} - 2, $self->{h} - 2;
1228 glVertex $self->{w} - 2, 2;
1229 glEnd;
1230 glDisable GL_BLEND;
1231
1232 $self->SUPER::_draw;
1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Slider;
1238
1239use strict;
1240
1241use SDL::OpenGL;
1242
1243our @ISA = CFClient::UI::DrawBG::;
1244
1245sub new {
1246 my $class = shift;
1247
1248 # range [value, low, high, page]
1249
1250 my $self = $class->SUPER::new (
1251 fg => [1, 1, 1],
1252 active_fg => [0, 0, 0],
1253 range => [0, 0, 100, 10],
1254 req_w => 40,
1255 req_h => 10,
1256 vertical => 0,
1257 @_
1258 );
1259
1260 $self
1261}
1262
1263sub size_request {
1264 my ($self) = @_;
1265
1266 my $w = $self->{req_w};
1267 my $h = $self->{req_h};
1268
1269 $self->{vertical} ? ($h, $w) : ($w, $h)
1270}
1271
1272sub button_down {
1273 my ($self, $ev, $x, $y) = @_;
1274
1275 $self->SUPER::button_down ($ev, $x, $y);
1276 $self->mouse_motion ($ev, $x, $y);
1277}
1278
1279sub mouse_motion {
1280 my ($self, $ev, $x, $y) = @_;
1281
1282 if ($GRAB == $self) {
1283 my ($value, $lo, $hi, $page) = @{$self->{range}};
1284
1285 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1286
1287 $x = $x * ($hi - $lo) / $w + $lo;
1288 $x = $lo if $x < $lo;
1289 $x = $hi - $page if $x > $hi - $page;
1290 $self->{range}[0] = $x;
1291
1292 $self->emit (changed => $x);
1293 $self->update;
1294 }
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 $self->SUPER::_draw ();
1301
1302 my ($w, $h) = @$self{qw(w h)};
1303
1304 if ($self->{vertical}) {
1305 # draw a vertical slider like a rotated horizontal slider
1306
1307 glRotate 90, 0, 0, 1;
1308 glTranslate 0, -$self->{w}, 0;
1309
1310 ($w, $h) = ($h, $w);
1311 }
1312
1313 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1314 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1315
1316 my ($value, $lo, $hi, $page) = @{$self->{range}};
1317
1318 $page = int $page * $w / ($hi - $lo);
1319 $value = int +($value - $lo) * $w / ($hi - $lo);
1320
1321 $w -= $page;
1322 $page &= ~1;
1323 glTranslate $page * 0.5, 0, 0;
1324 $page ||= 2;
1325
1326 glColor @$fg;
1327 glBegin GL_LINES;
1328 glVertex 0, 0; glVertex 0, $h;
1329 glVertex $w - 1, 0; glVertex $w - 1, $h;
1330 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1331 glEnd;
1332
1333 my $knob_a = $value - $page * 0.5;
1334 my $knob_b = $value + $page * 0.5;
1335
1336 glBegin GL_QUADS;
1337 glColor @$fg;
1338 glVertex $knob_a, 0;
1339 glVertex $knob_a, $h;
1340 glVertex $knob_b, $h;
1341 glVertex $knob_b, 0;
1342
1343 if ($knob_a < $knob_b - 2) {
1344 glColor @$bg;
1345 glVertex $knob_a + 1, 1;
1346 glVertex $knob_a + 1, $h - 1;
1347 glVertex $knob_b - 1, $h - 1;
1348 glVertex $knob_b - 1, 1;
1349 }
1350 glEnd;
1351}
1352
1353#############################################################################
1354
1355package CFClient::UI::MapWidget;
1356
1357use strict;
1358
1359use List::Util qw(min max);
1360
1361use SDL;
1362use SDL::OpenGL;
1363
1364our @ISA = CFClient::UI::Base::;
1365
1366sub new {
1367 my $class = shift;
1368
1369 $class->SUPER::new (
1370 z => -1,
1371 list => (glGenLists 1),
1372 @_
1373 )
1374}
701 1375
702sub key_down { 1376sub key_down {
703 print "MAPKEYDOWN\n"; 1377 print "MAPKEYDOWN\n";
704} 1378}
705 1379
706sub key_up { 1380sub key_up {
707} 1381}
708 1382
709sub size_request { 1383sub size_request {
710 1384 (
1385 1 + 32 * int $::WIDTH / 32,
1386 1 + 32 * int $::HEIGHT / 32,
1387 )
711} 1388}
712 1389
713sub size_allocate { 1390sub update {
714} 1391 my ($self) = @_;
715 1392
1393 $self->{need_update} = 1;
1394 $self->SUPER::update;
1395}
1396
716sub _draw { 1397sub draw {
717 my ($self) = @_; 1398 my ($self) = @_;
718 1399
1400 if (delete $self->{need_update}) {
1401 glNewList $self->{list}, GL_COMPILE;
1402
719 my $mx = $::CONN->{mapx}; 1403 my $mx = $::CONN->{mapx};
720 my $my = $::CONN->{mapy}; 1404 my $my = $::CONN->{mapy};
721 1405
722 my $map = $::CONN->{map}; 1406 my $map = $::CONN->{map};
723 1407
724 my ($xofs, $yofs); 1408 my ($xofs, $yofs);
725 1409
726 my $sw = 1 + int $::WIDTH / 32; 1410 my $sw = 1 + int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32; 1411 my $sh = 1 + int $::HEIGHT / 32;
728 1412
729 if ($::CONN->{mapw} > $sw) { 1413 if ($::CONN->{mapw} > $sw) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1414 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
731 } else { 1415 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1416 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 } 1417 }
734 1418
735 if ($::CONN->{maph} > $sh) { 1419 if ($::CONN->{maph} > $sh) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1420 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
737 } else { 1421 } else {
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1422 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
739 } 1423 }
740 1424
741 glEnable GL_TEXTURE_2D; 1425 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND; 1426 glEnable GL_BLEND;
1427 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1428 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 1429
745 my $sw4 = ($sw + 3) & ~3; 1430 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh); 1431 my $darkness = "\x00" x ($sw4 * $sh);
747 1432
748 for my $x (0 .. $sw - 1) { 1433 for my $x (0 .. $sw - 1) {
1434 my $row = $map->[$x + $xofs];
749 for my $y (0 .. $sh - 1) { 1435 for my $y (0 .. $sh - 1) {
750 1436
751 my $cell = $map->[$x + $xofs][$y + $yofs] 1437 my $cell = $row->[$y + $yofs]
752 or next; 1438 or next;
753 1439
754 my $darkness = $cell->[0] * (1 / 255); 1440 my $dark = $cell->[0];
755 if ($darkness < 0) { 1441 if ($dark < 0) {
756 $darkness = 0.15; 1442 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1443 } else {
1444 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
757 } 1445 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 1446
760 for my $num (grep $_, @$cell[1,2,3]) { 1447 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next; 1448 my $tex = $::CONN->{face}[$num]{texture} || next;
1449
1450 my ($w, $h) = @$tex{qw(w h)};
762 1451
763 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1452 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
764
765 my $w = $tex->{width};
766 my $h = $tex->{height};
767
768 my $px = ($x + 1) * 32 - $w;
769 my $py = ($y + 1) * 32 - $h;
770
771 glBegin GL_QUADS;
772 glTexCoord 0, 0; glVertex $px , $py;
773 glTexCoord 0, 1; glVertex $px , $py + $h;
774 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
775 glTexCoord 1, 0; glVertex $px + $w, $py;
776 glEnd; 1453 }
777 } 1454 }
778 } 1455 }
779 }
780 1456
781# if (1) { # higher quality darkness 1457# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs; 1458# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1459# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784# 1460#
… …
786# 1462#
787# $lighting = $pb->get_pixels; 1463# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs; 1464# $lighting =~ s/(.)../$1/gs;
789# } 1465# }
790 1466
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
809 1468
1469 $darkness = new CFClient::Texture
1470 w => $sw4,
1471 h => $sh,
1472 data => $darkness,
1473 internalformat => GL_ALPHA,
1474 format => GL_ALPHA;
1475
1476 glColor 0.45, 0.45, 0.45, 1;
1477 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1478
810 glDisable GL_TEXTURE_2D; 1479 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND; 1480 glDisable GL_BLEND;
1481
1482 glEndList;
1483 }
1484
1485 glCallList $self->{list};
812} 1486}
813 1487
814my %DIR = ( 1488my %DIR = (
815 SDLK_KP8, [1, "north"], 1489 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"], 1490 SDLK_KP9, [2, "northeast"],
… …
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1534 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 1535 $::CONN->send ("command run_stop");
862 } 1536 }
863} 1537}
864 1538
865package Crossfire::Client::Widget::Animator; 1539#############################################################################
1540
1541package CFClient::UI::Animator;
866 1542
867use SDL::OpenGL; 1543use SDL::OpenGL;
868 1544
869our @ISA = Crossfire::Client::Widget::Bin::; 1545our @ISA = CFClient::UI::Bin::;
870 1546
871sub moveto { 1547sub moveto {
872 my ($self, $x, $y) = @_; 1548 my ($self, $x, $y) = @_;
873 1549
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.01; 1551 $self->{speed} = 0.001;
876 $self->{time} = 1; 1552 $self->{time} = 1;
877 1553
878 ::animation_start $self; 1554 ::animation_start $self;
879} 1555}
880 1556
… …
895 1571
896sub _draw { 1572sub _draw {
897 my ($self) = @_; 1573 my ($self) = @_;
898 1574
899 glPushMatrix; 1575 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 1576 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 1577 $self->{children}[0]->draw;
902 glPopMatrix; 1578 glPopMatrix;
903} 1579}
904 1580
9051; 1581#############################################################################
906 1582
1583package CFClient::UI::Toplevel;
1584
1585our @ISA = CFClient::UI::Container::;
1586
1587sub size_request {
1588 ($::WIDTH, $::HEIGHT)
1589}
1590
1591sub size_allocate {
1592 my ($self, $x, $y, $w, $h) = @_;
1593
1594 $self->_size_allocate ($x, $y, $w, $h);
1595
1596 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1597 for @{$self->{children}};
1598}
1599
1600sub translate {
1601 my ($self, $x, $y) = @_;
1602
1603 ($x, $y)
1604}
1605
1606sub update {
1607 my ($self) = @_;
1608
1609 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1610 ::refresh ();
1611}
1612
1613sub add {
1614 my ($self, $widget) = @_;
1615
1616 $self->SUPER::add ($widget);
1617
1618 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1619}
1620
1621sub draw {
1622 my ($self) = @_;
1623
1624 $self->_draw;
1625}
1626
1627#############################################################################
1628
1629package CFClient::UI;
1630
1631$TOPLEVEL = new CFClient::UI::Toplevel;
1632
16331
1634

Diff Legend

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